meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch

   1 From 3d8cce4420f84bac979e9b10384fddb4d7c810d9 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Wed, 18 Nov 2020 09:45:54 +0800
   4 Subject: [PATCH] kubernetes.pp: add re-tries for docker login
   5
   6 The docker login to local registry may sometimes fail:
   7 Error: docker login registry.local:9001 -u admin -p St8rlingX* returned 1 instead of one of [0]
   8
   9 It's rare and the root cause is not found yet, but a re-try will always succeed,
  10 so add re-tries and a try sleep between re-tries to workaround it for now.
  11
  12 Upstream-Status: Inappropriate [workaround]
  13
  14 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  15 ---
  16  puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 4 ++++
  17  1 file changed, 4 insertions(+)
  18
  19 diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
  20 index 3fa1c8a..af69373 100644
  21 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
  22 +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
  23 @@ -269,6 +269,8 @@ class platform::kubernetes::master::init
  24      -> exec { 'login local registry':
  25        command   => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars
  26        logoutput => true,
  27 +      tries     => 3,
  28 +      try_sleep => 1,
  29      }
  30
  31      -> exec { 'kubeadm to pre pull images':
  32 @@ -384,6 +386,8 @@ class platform::kubernetes::worker::init
  33        exec { 'login local registry':
  34          command   => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars
  35          logoutput => true,
  36 +        tries     => 3,
  37 +        try_sleep => 1,
  38        }
  39
  40        -> exec { 'load k8s pause image':
  41 --
  42 2.7.4
  43