Skip to content

OCPBUGS-8425: Fix the kustomization procedure not to exit with fatal error #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 12, 2023
Merged

OCPBUGS-8425: Fix the kustomization procedure not to exit with fatal error #1463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/kustomize/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment thread
ggiguash marked this conversation as resolved.
Outdated
} else {
klog.Infof("Kustomization at %v applied successfully.", kustomization)
}
Expand All @@ -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
Expand Down