Improve uniqueness of ClusterControlPlane

Signed-off-by: Kumar Atish <kumar.atish@broadcom.com>

Author: Atish-iaf

pkg/nsx/services/nsxserviceaccount/cluster.go

@@ -104,7 +104,7 @@ func (s *NSXServiceAccountService) SetUpStore() {
 }
 
 func (s *NSXServiceAccountService) CreateOrUpdateNSXServiceAccount(ctx context.Context, obj *v1alpha1.NSXServiceAccount) error {
-	clusterName := s.getClusterName(obj.Namespace, obj.Name)
+	clusterName := s.getClusterName(obj.Status.ClusterName, obj.Namespace, obj.Name)
 	normalizedClusterName := util.NormalizeId(clusterName)
 	// TODO: Use WCPConfig.NSXTProject as project when WCPConfig.EnableWCPVPCNetwork is true
 	project := s.NSXConfig.CoeConfig.Cluster
@@ -345,7 +345,7 @@ func (s *NSXServiceAccountService) DeleteNSXServiceAccount(ctx context.Context,
 		isDeleteSecret = true
 	}
 
-	clusterName := s.getClusterName(namespacedName.Namespace, namespacedName.Name)
+	clusterName := s.getClusterName(nsxsa.Status.ClusterName, namespacedName.Namespace, namespacedName.Name)
 	normalizedClusterName := util.NormalizeId(clusterName)
 	// delete Secret
 	if isDeleteSecret {
@@ -400,7 +400,7 @@ func (s *NSXServiceAccountService) DeleteNSXServiceAccount(ctx context.Context,
 func (s *NSXServiceAccountService) ValidateAndUpdateRealizedNSXServiceAccount(ctx context.Context, obj *v1alpha1.NSXServiceAccount, ca []byte,
 	nsxRestoreStatus *v1alpha1.NSXRestoreStatus) error {
 
-	clusterName := s.getClusterName(obj.Namespace, obj.Name)
+	clusterName := s.getClusterName(obj.Status.ClusterName, obj.Namespace, obj.Name)
 	normalizedClusterName := util.NormalizeId(clusterName)
 	secretName := obj.Name + SecretSuffix
 	secretNamespace := obj.Namespace
@@ -594,8 +594,11 @@ func (s *NSXServiceAccountService) GetNSXServiceAccountNameByUID(uid string) (na
 	return
 }
 
-func (s *NSXServiceAccountService) getClusterName(namespace, name string) string {
-	return fmt.Sprintf("%s-%s-%s", s.NSXConfig.CoeConfig.Cluster, namespace, name)
+func (s *NSXServiceAccountService) getClusterName(clusterName, namespace, name string) string {
+	if clusterName != "" {
+		return clusterName
+	}
+	return fmt.Sprintf("%s_%s_%s", s.NSXConfig.CoeConfig.Cluster, namespace, name)
 }
 
 func GenerateNSXServiceAccountConditions(existingConditions []metav1.Condition, generation int64, realizedStatus metav1.ConditionStatus, realizedReason string, message string) []metav1.Condition {