From 26422ee2db9d089295f888cf3b89274ce7e24b02 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Sun, 12 Mar 2023 18:33:42 +0000 Subject: [PATCH] Fix the kustomization procedure not to exit with fatal error --- pkg/kustomize/apply.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kustomize/apply.go b/pkg/kustomize/apply.go index a1019f17e1..bfe06de1c6 100644 --- a/pkg/kustomize/apply.go +++ b/pkg/kustomize/apply.go @@ -56,7 +56,7 @@ func (s *Kustomizer) ApplyKustomizationPath(path string) { if _, err := os.Stat(kustomization); !errors.Is(err, os.ErrNotExist) { klog.Infof("Applying kustomization at %v ", kustomization) if err := ApplyKustomizationWithRetries(path, s.kubeconfig); err != nil { - klog.Fatalf("Applying kustomization at %v failed: %s. Giving up.", kustomization, err) + klog.Errorf("Applying kustomization at %v failed: %s. Giving up.", kustomization, err) } else { klog.Infof("Kustomization at %v applied successfully.", kustomization) } @@ -66,7 +66,7 @@ func (s *Kustomizer) ApplyKustomizationPath(path string) { } func ApplyKustomizationWithRetries(kustomization string, kubeconfig string) error { - return wait.Poll(retryInterval, retryTimeout, func() (bool, error) { + return wait.PollImmediate(retryInterval, retryTimeout, func() (bool, error) { if err := ApplyKustomization(kustomization, kubeconfig); err != nil { klog.Infof("Applying kustomization failed: %s. Retrying in %s.", err, retryInterval) return false, nil