fix: owner cluster handling

Signed-off-by: sivchari <[email protected]>

Author: sivchari

controlplane/kubeadm/internal/controllers/controller.go

@@ -154,12 +154,14 @@ func (r *KubeadmControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.
 	// Fetch the Cluster.
 	cluster, err := util.GetOwnerCluster(ctx, r.Client, kcp.ObjectMeta)
 	if err != nil {
-		if apierrors.IsNotFound(err) {
-			log.Info("Cluster Controller has not yet set OwnerRef")
-			return ctrl.Result{}, nil
+		if !apierrors.IsNotFound(err) {
+			log.Error(err, "Failed to retrieve owner Cluster from the API Server")
+			return ctrl.Result{}, err
 		}
-		log.Error(err, "Failed to retrieve owner Cluster from the API Server")
-		return ctrl.Result{}, err
+	}
+	if apierrors.IsNotFound(err) || cluster == nil {
+		log.Info("Cluster Controller has not yet set OwnerRef")
+		return ctrl.Result{}, nil
 	}
 
 	log = log.WithValues("Cluster", klog.KObj(cluster))

controlplane/kubeadm/internal/controllers/controller_test.go

@@ -343,7 +343,7 @@ func TestReconcileNoCluster(t *testing.T) {
 	}
 
 	_, err = r.Reconcile(ctx, ctrl.Request{NamespacedName: util.ObjectKey(kcp)})
-	g.Expect(err).To(HaveOccurred())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	machineList := &clusterv1.MachineList{}
 	g.Expect(fakeClient.List(ctx, machineList, client.InNamespace(metav1.NamespaceDefault))).To(Succeed())