Skip to content
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

Jump to bottom

Use latest generation when updating final status #164

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Use latest generation when updating final status #164

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
12 changes: 11 additions & 1 deletion controllers/kustomization_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func (r *KustomizationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
}

// update status
if err := r.Status().Update(ctx, &reconciledKustomization); err != nil {
if err := r.updateStatus(ctx, req, reconciledKustomization.Status); err != nil {
log.Error(err, "unable to update status after reconciliation")
return ctrl.Result{Requeue: true}, err
}
Expand Down Expand Up @@ -1033,6 +1033,16 @@ func (r *KustomizationReconciler) newKustomizationClient(kustomization kustomize
return client, statusPoller, err
}

func (r *KustomizationReconciler) updateStatus(ctx context.Context, req ctrl.Request, newStatus kustomizev1.KustomizationStatus) error {
var kustomization kustomizev1.Kustomization
if err := r.Get(ctx, req.NamespacedName, &kustomization); err != nil {
return err
}

kustomization.Status = newStatus
return r.Status().Update(ctx, &kustomization)
}

func containsString(slice []string, s string) bool {
for _, item := range slice {
if item == s {
Expand Down