X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=cd3bf7ecc47e5c8855a67efa61295a4420df85c3;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch
deleted file mode 100644
index cd3bf7e..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3d8cce4420f84bac979e9b10384fddb4d7c810d9 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 18 Nov 2020 09:45:54 +0800
-Subject: [PATCH] kubernetes.pp: add re-tries for docker login
-
-The docker login to local registry may sometimes fail:
-Error: docker login registry.local:9001 -u admin -p St8rlingX* returned 1 instead of one of [0]
-
-It's rare and the root cause is not found yet, but a re-try will always succeed,
-so add re-tries and a try sleep between re-tries to workaround it for now.
-
-Upstream-Status: Inappropriate [workaround]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
-index 3fa1c8a..af69373 100644
---- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
-@@ -269,6 +269,8 @@ class platform::kubernetes::master::init
-     -> exec { 'login local registry':
-       command   => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars
-       logoutput => true,
-+      tries     => 3,
-+      try_sleep => 1,
-     }
-
-     -> exec { 'kubeadm to pre pull images':
-@@ -384,6 +386,8 @@ class platform::kubernetes::worker::init
-       exec { 'login local registry':
-         command   => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars
-         logoutput => true,
-+        tries     => 3,
-+        try_sleep => 1,
-       }
-
-       -> exec { 'load k8s pause image':
---
-2.7.4
-