Fix affinity group naming

Author: vishesh92

controllers/utils/affinity_group.go

@@ -18,9 +18,10 @@ package utils
 
 import (
 	"fmt"
+	"strings"
+
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
-	"strings"
 
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -94,6 +95,13 @@ func GenerateAffinityGroupName(csm infrav1.CloudStackMachine, capiMachine *clust
 		return "", errors.Errorf("could not find owner UID for %s/%s", csm.Namespace, csm.Name)
 	}
 	titleCaser := cases.Title(language.English)
+
+	// If the machine's owner is KubeadmControlPlane or EtcdadmCluster, then we don't consider the name and UID of the
+	// owner, since there will only be one of each of those per cluster.
+	if managerOwnerRef.Kind == "KubeadmControlPlane" || managerOwnerRef.Kind == "EtcdadmCluster" {
+		return fmt.Sprintf("%sAffinity-%s-%s",
+			titleCaser.String(csm.Spec.Affinity), managerOwnerRef.Kind, csm.Spec.FailureDomainName), nil
+	}
 	return fmt.Sprintf("%sAffinity-%s-%s-%s",
 		titleCaser.String(csm.Spec.Affinity), managerOwnerRef.Name, managerOwnerRef.UID, csm.Spec.FailureDomainName), nil
 }

controllers/utils/utils.go

@@ -128,10 +128,10 @@ func fetchOwnerRef(refList []meta.OwnerReference, kind string) *meta.OwnerRefere
 func GetManagementOwnerRef(capiMachine *clusterv1.Machine) *meta.OwnerReference {
 	if util.IsControlPlaneMachine(capiMachine) {
 		return fetchOwnerRef(capiMachine.OwnerReferences, "KubeadmControlPlane")
-	} else if ref := fetchOwnerRef(capiMachine.OwnerReferences, "MachineSet"); ref != nil {
+	} else if ref := fetchOwnerRef(capiMachine.OwnerReferences, "EtcdadmCluster"); ref != nil {
 		return ref
 	}
-	return fetchOwnerRef(capiMachine.OwnerReferences, "EtcdadmCluster")
+	return fetchOwnerRef(capiMachine.OwnerReferences, "MachineSet")
 }
 
 // GetOwnerOfKind returns the Cluster object owning the current resource of passed kind.