Update controllers/tenant_compile_pipeline_controller.go

Co-authored-by: Sebastian Widmer <sebastian.widmer@vshn.net>
projectsyn · Jul 26, 2024 · 1daf931 · 1daf931
1 parent 9b99160
commit 1daf931
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/controllers/tenant_compile_pipeline_controller.go b/controllers/tenant_compile_pipeline_controller.go
@@ -64,16 +64,15 @@ func (r *TenantCompilePipelineReconciler) Reconcile(ctx context.Context, request
 
 		nsName := types.NamespacedName{Name: clusterName, Namespace: tenant.GetNamespace()}
 		err := r.Client.Get(ctx, nsName, cluster)
-		if err != nil && !errors.IsNotFound(err) {
+		if err != nil {
+			if errors.IsNotFound(err) {
+				reqLogger.Info("Could not find cluster from list in .Status.CompilePipeline.Clusters", "clusterName", clusterName)
+				continue
+			}
 			return reconcile.Result{}, fmt.Errorf("while reconciling CI variables for clusters: %w", err)
 		}
-		if err != nil && errors.IsNotFound(err) {
-			reqLogger.Info("Could not find cluster from list in .Status.CompilePipeline.Clusters", "clusterName", clusterName)
-		}
 
-		if err == nil {
-			changed = ensureClusterCiVariable(tenant, cluster) || changed
-		}
+		changed = ensureClusterCiVariable(tenant, cluster) || changed
 	}
 	if changed {
 		err = r.Client.Update(ctx, tenant)