Merge pull request #399 from Dee-6777/add-domain-prefix

OSD-21691 : Add domain prefix in place of cluster name for cluster namespace
openshift · Apr 19, 2024 · 3f1f834 · 3f1f834
2 parents ff1d882 + 4c053bd
commit 3f1f834
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/cmd/ocm-backplane/login/login.go b/cmd/ocm-backplane/login/login.go
@@ -190,7 +190,6 @@ func runLogin(cmd *cobra.Command, argv []string) (err error) {
 		logger.WithField("Cluster ID", clusterID).Debugln("Finding managing cluster")
 		var isHostedControlPlane bool
 		targetClusterID := clusterID
-		targetClusterName := clusterName
 
 		clusterID, clusterName, isHostedControlPlane, err = ocm.DefaultOCMInterface.GetManagingCluster(clusterID)
 		if err != nil {
@@ -207,7 +206,7 @@ func runLogin(cmd *cobra.Command, argv []string) (err error) {
 		logger.Debugln("Finding K8s namespaces")
 		// Print the related namespace if login to manager cluster
 		var namespaces []string
-		namespaces, err = listNamespaces(targetClusterID, targetClusterName, isHostedControlPlane)
+		namespaces, err = listNamespaces(targetClusterID, isHostedControlPlane)
 		if err != nil {
 			return err
 		}
@@ -469,14 +468,19 @@ func doLogin(api, clusterID, accessToken string) (string, error) {
 	return api + *loginResp.JSON200.ProxyUri, nil
 }
 
-func listNamespaces(clusterID, clusterName string, isHostedControlPlane bool) ([]string, error) {
+func listNamespaces(clusterID string, isHostedControlPlane bool) ([]string, error) {
 
 	env, err := ocm.DefaultOCMInterface.GetOCMEnvironment()
 	if err != nil {
 		return []string{}, err
 	}
 	envName := env.Name()
 
+	clusterInfo, err := ocm.DefaultOCMInterface.GetClusterInfoByID(clusterID)
+	if err != nil {
+		return []string{}, err
+	}
+
 	klusterletPrefix := "klusterlet-"
 	hivePrefix := fmt.Sprintf("uhc-%s-", envName)
 	hcpPrefix := fmt.Sprintf("ocm-%s-", envName)
@@ -487,7 +491,7 @@ func listNamespaces(clusterID, clusterName string, isHostedControlPlane bool) ([
 		nsList = []string{
 			klusterletPrefix + clusterID,
 			hcpPrefix + clusterID,
-			hcpPrefix + clusterID + "-" + clusterName,
+			hcpPrefix + clusterID + "-" + clusterInfo.DomainPrefix(),
 		}
 	} else {
 		nsList = []string{

diff --git a/cmd/ocm-backplane/login/login_test.go b/cmd/ocm-backplane/login/login_test.go
@@ -292,6 +292,7 @@ var _ = Describe("Login command", func() {
 
 		It("should return the managing cluster if one is requested", func() {
 			globalOpts.Manager = true
+			mockOcmInterface.EXPECT().GetClusterInfoByID(gomock.Any()).Return(mockCluster, nil).AnyTimes()
 			mockOcmInterface.EXPECT().GetOCMEnvironment().Return(ocmEnv, nil).AnyTimes()
 			mockOcmInterface.EXPECT().GetTargetCluster(testClusterID).Return(trueClusterID, testClusterID, nil)
 			mockOcmInterface.EXPECT().GetManagingCluster(trueClusterID).Return(managingClusterID, managingClusterID, true, nil)