Merge pull request #12935 from Karthik-K-N/error-check

k8s-ci-robot · web-flow · commit 74df86c8bc32 · 2025-11-03T07:02:07.000-08:00
🌱 Check for error before checking reconcile result
diff --git a/controlplane/kubeadm/internal/controllers/controller.go b/controlplane/kubeadm/internal/controllers/controller.go
@@ -447,7 +447,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, controlPl
 	}
 
 	// Generate Cluster Kubeconfig if needed
-	if result, err := r.reconcileKubeconfig(ctx, controlPlane); !result.IsZero() || err != nil {
+	if result, err := r.reconcileKubeconfig(ctx, controlPlane); err != nil || !result.IsZero() {
 		if err != nil {
 			log.Error(err, "Failed to reconcile Kubeconfig")
 		}

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, controlPl`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`// Generate Cluster Kubeconfig if needed`
`450`		`- if result, err := r.reconcileKubeconfig(ctx, controlPlane); !result.IsZero() \|\| err != nil {`
	`450`	`+ if result, err := r.reconcileKubeconfig(ctx, controlPlane); err != nil \|\| !result.IsZero() {`
`451`	`451`	`if err != nil {`
`452`	`452`	`log.Error(err, "Failed to reconcile Kubeconfig")`
`453`	`453`	`}`