Mild cleanup.

Author: Joshua Reed

api/v1beta2/cloudstackcluster_types.go

@@ -22,8 +22,7 @@ import (
 )
 
 const (
-	ClusterFinalizer           = "cloudstackcluster.infrastructure.cluster.x-k8s.io"
-	CloudStackClusterLabelName = "cloudstackcluster.infrastructure.cluster.x-k8s.io/name"
+	ClusterFinalizer = "cloudstackcluster.infrastructure.cluster.x-k8s.io"
 )
 
 // CloudStackClusterSpec defines the desired state of CloudStackCluster.

controllers/cloudstackfailuredomain_controller.go

@@ -143,7 +143,7 @@ func (r *CloudStackFailureDomainReconciliationRunner) ClearMachines() (ctrl.Resu
 		}
 	}
 	if len(machines.Items) > 0 {
-		return r.RequeueWithMessage("FailureDomain still has machine in it.")
+		return r.RequeueWithMessage("FailureDomain still has machine(s) in it.")
 	}
 	return ctrl.Result{}, nil
 }

controllers/utils/base_reconciler.go

@@ -487,8 +487,7 @@ func (r *ReconciliationRunner) NewChildObjectMeta(name string) metav1.ObjectMeta
 	return metav1.ObjectMeta{
 		Name:      strings.ToLower(name),
 		Namespace: r.Request.Namespace,
-		Labels: map[string]string{clusterv1.ClusterLabelName: r.CAPICluster.Name,
-			infrav1.CloudStackClusterLabelName: r.CAPICluster.Name},
+		Labels:    map[string]string{clusterv1.ClusterLabelName: r.CAPICluster.Name},
 		OwnerReferences: []metav1.OwnerReference{
 			*metav1.NewControllerRef(r.ReconciliationSubject, ownerGVK),
 		},