Removed use of clustername field.

Author: Joshua Reed

controllers/utils/base_reconciler.go

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

controllers/utils/failuredomains.go

@@ -79,7 +79,7 @@ func (r *ReconciliationRunner) RemoveExtraneousFailureDomains(fds *infrav1.Cloud
 		fdPresenceByName := map[string]bool{}
 		for _, fdSpec := range r.CSCluster.Spec.FailureDomains {
 			name := fdSpec.Name
-			if !strings.HasSuffix(name, "-"+r.CAPICluster.ClusterName) { // Add cluster name suffix if missing.
+			if !strings.HasSuffix(name, "-"+r.CAPICluster.Name) { // Add cluster name suffix if missing.
 				name = name + "-" + r.CAPICluster.Name
 			}
 			fdPresenceByName[name] = true