fixes

Author: chrischdi

controllers/clustermodule_reconciler.go

@@ -300,7 +300,7 @@ func (r Reconciler) fetchMachineOwnerObjects(ctx context.Context, clusterCtx *ca
 		}
 	}
 
-	mdList := &clusterv1beta1.MachineDeploymentList{}
+	mdList := &clusterv1.MachineDeploymentList{}
 	if err := r.Client.List(
 		ctx, mdList,
 		client.InNamespace(clusterCtx.VSphereCluster.GetNamespace()),

controllers/vspheremachine_controller.go

@@ -396,7 +396,7 @@ func (r *machineReconciler) reconcileNormal(ctx context.Context, machineCtx capv
 	// 2) If the Cluster is supervisor-based continue to reconcile as InfrastructureProvisioned is not set to true until after the kube apiserver is available.
 	if !r.supervisorBased {
 		// vmwarev1.VSphereCluster doesn't set Cluster.Status.Ready until the API endpoint is available.
-		if !machineCtx.GetCluster().Status.Initialization.InfrastructureProvisioned {
+		if machineCtx.GetCluster().Status.Initialization == nil || !machineCtx.GetCluster().Status.Initialization.InfrastructureProvisioned {
 			log.Info("Cluster infrastructure is not ready yet, skipping reconciliation")
 			deprecatedconditions.MarkFalse(machineCtx.GetVSphereMachine(), infrav1.VMProvisionedCondition, infrav1.WaitingForClusterInfrastructureReason, clusterv1beta1.ConditionSeverityInfo, "")
 			deprecatedv1beta2conditions.Set(machineCtx.GetVSphereMachine(), metav1.Condition{

controllers/vspheremachine_controller_test.go

@@ -165,6 +165,9 @@ var _ = Describe("VsphereMachineReconciler", func() {
 		Eventually(func() error {
 			ph, err := patch.NewHelper(capiCluster, testEnv)
 			Expect(err).ShouldNot(HaveOccurred())
+			if capiCluster.Status.Initialization == nil {
+				capiCluster.Status.Initialization = &clusterv1.ClusterInitializationStatus{}
+			}
 			capiCluster.Status.Initialization.InfrastructureProvisioned = true
 			return ph.Patch(ctx, capiCluster, patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
@@ -178,6 +181,9 @@ var _ = Describe("VsphereMachineReconciler", func() {
 		BeforeEach(func() {
 			ph, err := patch.NewHelper(capiCluster, testEnv)
 			Expect(err).ShouldNot(HaveOccurred())
+			if capiCluster.Status.Initialization == nil {
+				capiCluster.Status.Initialization = &clusterv1.ClusterInitializationStatus{}
+			}
 			capiCluster.Status.Initialization.InfrastructureProvisioned = true
 			Expect(ph.Patch(ctx, capiCluster, patch.WithStatusObservedGeneration{})).To(Succeed())
 		})

internal/test/helpers/vmware/intg_test_context.go

@@ -174,6 +174,9 @@ func CreateAndWait(ctx context.Context, integrationTestClient client.Client, obj
 func ClusterInfrastructureProvisioned(ctx context.Context, c client.Client, clusterCache clustercache.ClusterCache, cluster *clusterv1.Cluster) {
 	GinkgoHelper()
 	patch := client.MergeFrom(cluster.DeepCopy())
+	if cluster.Status.Initialization == nil {
+		cluster.Status.Initialization = &clusterv1.ClusterInitializationStatus{}
+	}
 	cluster.Status.Initialization.InfrastructureProvisioned = true
 	Expect(c.Status().Patch(ctx, cluster, patch)).To(Succeed())
 

pkg/services/vmoperator/vmopmachine.go

@@ -460,7 +460,7 @@ func (v *VmopMachineService) reconcileVMOperatorVM(ctx context.Context, supervis
 		// Not all network providers (for example, NSX-VPC) provide support for VM
 		// readiness probes. The flag PerformsVMReadinessProbe is used to determine
 		// whether a VM readiness probe should be conducted.
-		if v.ConfigureControlPlaneVMReadinessProbe && infrautilv1.IsControlPlaneMachine(supervisorMachineCtx.Machine) && supervisorMachineCtx.Cluster.Status.Initialization.ControlPlaneInitialized {
+		if v.ConfigureControlPlaneVMReadinessProbe && infrautilv1.IsControlPlaneMachine(supervisorMachineCtx.Machine) && supervisorMachineCtx.Cluster.Status.Initialization != nil && supervisorMachineCtx.Cluster.Status.Initialization.ControlPlaneInitialized {
 			vmOperatorVM.Spec.ReadinessProbe = &vmoprv1.VirtualMachineReadinessProbeSpec{
 				TCPSocket: &vmoprv1.TCPSocketAction{
 					Port: intstr.FromInt(defaultAPIBindPort),

pkg/services/vmoperator/vmopmachine_test.go

@@ -406,6 +406,9 @@ var _ = Describe("VirtualMachine tests", func() {
 
 			By("Setting cluster.Status.ControlPlaneReady to true")
 			// Set the control plane to be ready so that the new VM will have a probe
+			if cluster.Status.Initialization == nil {
+				cluster.Status.Initialization = &clusterv1.ClusterInitializationStatus{}
+			}
 			cluster.Status.Initialization.ControlPlaneInitialized = true
 
 			vmopVM = getReconciledVM(ctx, vmService, supervisorMachineContext)