Address PR comments.

Author: Joshua Reed

api/v1beta2/cloudstackmachine_types.go

@@ -71,7 +71,7 @@ type CloudStackMachineSpec struct {
 	Affinity string `json:"affinity,omitempty"`
 
 	// Mutually exclusive parameter with AffinityGroupIDs.
-	// Is a reference to a CloudStack affiniity group CRD.
+	// Is a reference to a CloudStack affinity group CRD.
 	// +optional
 	AffinityGroupRef *corev1.ObjectReference `json:"cloudstackaffinityref,omitempty"`
 

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachines.yaml

@@ -308,7 +308,7 @@ spec:
                 type: array
               cloudstackaffinityref:
                 description: Mutually exclusive parameter with AffinityGroupIDs. Is
-                  a reference to a CloudStack affiniity group CRD.
+                  a reference to a CloudStack affinity group CRD.
                 properties:
                   apiVersion:
                     description: API version of the referent.

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinetemplates.yaml

@@ -258,7 +258,7 @@ spec:
                         type: array
                       cloudstackaffinityref:
                         description: Mutually exclusive parameter with AffinityGroupIDs.
-                          Is a reference to a CloudStack affiniity group CRD.
+                          Is a reference to a CloudStack affinity group CRD.
                         properties:
                           apiVersion:
                             description: API version of the referent.

config/manager/manager.yaml

@@ -15,8 +15,8 @@ spec:
       labels:
         control-plane: capc-controller-manager
     spec:
-      # securityContext:
-      #   runAsNonRoot: true
+      securityContext:
+        runAsNonRoot: true
       containers:
       - command:
         - /manager

controllers/cloudstackcluster_controller.go

@@ -103,26 +103,40 @@ func (r *CloudStackClusterReconciliationRunner) SetReady() (ctrl.Result, error)
 
 // VerifyFailureDomainCRDs verifies the FailureDomains found match against those requested.
 func (r *CloudStackClusterReconciliationRunner) VerifyFailureDomainCRDs() (ctrl.Result, error) {
-	expected := len(r.ReconciliationSubject.Spec.FailureDomains)
-	actual := len(r.FailureDomains.Items)
-	if expected != actual {
-		return r.RequeueWithMessage(fmt.Sprintf("Expected %d FailureDomains, but found %d", expected, actual))
-	}
-	for _, fd := range r.FailureDomains.Items {
-		if !fd.Status.Ready {
-			return r.RequeueWithMessage(fmt.Sprintf("FailureDomains %s/%s not ready, requeueing.", fd.Namespace, fd.Name))
+	// Check that all required failure domains are present and ready.
+	for _, requiredFd := range r.ReconciliationSubject.Spec.FailureDomains {
+		found := false
+		for _, fd := range r.FailureDomains.Items {
+			requiredFDName := withClusterSuffix(requiredFd.Name, r.CAPICluster.Name)
+			if requiredFDName == fd.Name {
+				found = true
+				if !fd.Status.Ready {
+					return r.RequeueWithMessage(fmt.Sprintf("Required FailureDomain %s not ready, requeueing.", fd.Name))
+				}
+				break
+			}
+		}
+		if !found {
+			return r.RequeueWithMessage(fmt.Sprintf("Required FailureDomain %s not found, requeueing.", requiredFd.Name))
 		}
 	}
 	return ctrl.Result{}, nil
 }
 
+// withClusterSuffix appends a hyphen and the cluster name to a name if not already present.
+func withClusterSuffix(name string, clusterName string) string {
+	newName := name
+	if !strings.HasSuffix(name, "-"+clusterName) { // Add cluster name suffix if missing.
+		newName = name + "-" + clusterName
+	}
+	return newName
+}
+
 // SetFailureDomainsStatusMap sets failure domains in CloudStackCluster status to be used for CAPI machine placement.
 func (r *CloudStackClusterReconciliationRunner) SetFailureDomainsStatusMap() (ctrl.Result, error) {
 	r.ReconciliationSubject.Status.FailureDomains = clusterv1.FailureDomains{}
 	for _, fdSpec := range r.ReconciliationSubject.Spec.FailureDomains {
-		if !strings.HasSuffix(fdSpec.Name, "-"+r.CAPICluster.Name) { // Add cluster name suffix if missing.
-			fdSpec.Name = fdSpec.Name + "-" + r.CAPICluster.Name
-		}
+		fdSpec.Name = withClusterSuffix(fdSpec.Name, r.CAPICluster.Name)
 		r.ReconciliationSubject.Status.FailureDomains[fdSpec.Name] = clusterv1.FailureDomainSpec{ControlPlane: true}
 	}
 	return ctrl.Result{}, nil

controllers/cloudstackmachine_controller_test.go

@@ -50,7 +50,7 @@ var _ = Describe("CloudStackMachineReconciler", func() {
 			setClusterReady()
 		})
 
-		It("Shoueld call GetOrCreateVMInstance and set Status.Ready to true", func() {
+		It("Should call GetOrCreateVMInstance and set Status.Ready to true", func() {
 			// Mock a call to GetOrCreateVMInstance and set the machine to running.
 			mockCloudClient.EXPECT().GetOrCreateVMInstance(
 				gomock.Any(), gomock.Any(), gomock.Any(),