bug: Cluster should be provisoned when cpRef and endpoint is set

We're currently treating the infrastructureRef as almost a requirement,
which in fact isn't and it's an optional reference.

If the Cluster control plane reference is populated, the endpoint is
valid, and the control plane is ready, set the phase to provisioned

Signed-off-by: Vince Prignano <[email protected]>

Author: vincepri

internal/controllers/cluster/cluster_controller_phases.go

@@ -48,11 +48,13 @@ func (r *Reconciler) reconcilePhase(_ context.Context, cluster *clusterv1.Cluste
 		cluster.Status.SetTypedPhase(clusterv1.ClusterPhasePending)
 	}
 
-	if cluster.Spec.InfrastructureRef != nil {
+	if cluster.Spec.InfrastructureRef != nil || cluster.Spec.ControlPlaneRef != nil {
 		cluster.Status.SetTypedPhase(clusterv1.ClusterPhaseProvisioning)
 	}
 
-	if cluster.Status.InfrastructureReady && cluster.Spec.ControlPlaneEndpoint.IsValid() {
+	if (cluster.Spec.InfrastructureRef == nil || cluster.Status.InfrastructureReady) &&
+		(cluster.Spec.ControlPlaneRef == nil || cluster.Status.ControlPlaneReady) &&
+		cluster.Spec.ControlPlaneEndpoint.IsValid() {
 		cluster.Status.SetTypedPhase(clusterv1.ClusterPhaseProvisioned)
 	}
 
@@ -151,6 +153,8 @@ func (r *Reconciler) reconcileInfrastructure(ctx context.Context, cluster *clust
 	log := ctrl.LoggerFrom(ctx)
 
 	if cluster.Spec.InfrastructureRef == nil {
+		// If the infrastructure ref is not set, marking the infrastructure as ready (no-op).
+		cluster.Status.InfrastructureReady = true
 		return ctrl.Result{}, nil
 	}
 

internal/controllers/cluster/cluster_controller_phases_test.go

@@ -86,6 +86,9 @@ func TestClusterReconcilePhases(t *testing.T) {
 				name:      "returns no error if infrastructure ref is nil",
 				cluster:   &clusterv1.Cluster{ObjectMeta: metav1.ObjectMeta{Name: "test-cluster", Namespace: "test-namespace"}},
 				expectErr: false,
+				check: func(g *GomegaWithT, in *clusterv1.Cluster) {
+					g.Expect(in.Status.InfrastructureReady).To(BeTrue())
+				},
 			},
 			{
 				name:         "returns error if unable to reconcile infrastructure ref",
@@ -566,6 +569,26 @@ func TestClusterReconciler_reconcilePhase(t *testing.T) {
 
 			wantPhase: clusterv1.ClusterPhaseProvisioned,
 		},
+		{
+			name: "no cluster infrastructure, control plane ready and ControlPlaneEndpoint is set",
+			cluster: &clusterv1.Cluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-cluster",
+				},
+				Spec: clusterv1.ClusterSpec{
+					ControlPlaneEndpoint: clusterv1.APIEndpoint{
+						Host: "1.2.3.4",
+						Port: 8443,
+					},
+					ControlPlaneRef: &corev1.ObjectReference{},
+				},
+				Status: clusterv1.ClusterStatus{
+					ControlPlaneReady: true,
+				},
+			},
+
+			wantPhase: clusterv1.ClusterPhaseProvisioned,
+		},
 		{
 			name: "cluster status has FailureReason",
 			cluster: &clusterv1.Cluster{