Don't override the reconcile error on status patching

Signed-off-by: Stefan Prodan <[email protected]>
fluxcd · Nov 10, 2022 · 20f3447 · 20f3447
1 parent 9582513
commit 20f3447
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go
@@ -175,7 +175,10 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
  // Finalise the reconciliation and report the results.
  defer func() {
- retErr = r.finalizeStatus(ctx, obj, patcher)
+ // Patch finalizers, status and conditions.
+ if err := r.finalizeStatus(ctx, obj, patcher); err != nil {
+ retErr = kerrors.NewAggregate([]error{retErr, err})
+ }
 
  // Record Prometheus metrics.
  r.Metrics.RecordReadiness(ctx, obj)

diff --git a/controllers/kustomization_wait_test.go b/controllers/kustomization_wait_test.go
@@ -154,14 +154,11 @@ parameters:
 
  g.Eventually(func() bool {
  _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), resultK)
- return isReconcileRunning(resultK)
+ return isReconcileRunning(resultK) && conditions.IsUnknown(resultK, kustomizev1.HealthyCondition)
  }, timeout, time.Second).Should(BeTrue())
  logStatus(t, resultK)
 
  expectedMessage := "Running health checks"
- g.Expect(conditions.IsUnknown(resultK, kustomizev1.HealthyCondition)).To(BeTrue())
- g.Expect(conditions.IsUnknown(resultK, meta.ReadyCondition)).To(BeTrue())
-
  for _, c := range []string{meta.ReconcilingCondition, kustomizev1.HealthyCondition} {
  g.Expect(conditions.GetReason(resultK, c)).To(BeIdenticalTo(meta.ProgressingReason))
  g.Expect(conditions.GetMessage(resultK, c)).To(ContainSubstring(expectedMessage))