Merge pull request #30422 from ropatil010/fix-hcpname

openshift-merge-bot[bot] · web-flow · commit 4bbf55e9e607 · 2025-10-24T20:10:47.000Z
NO-JIRA: fix hcpclustername
diff --git a/test/extended/util/compat_otp/hypeshift_cluster.go b/test/extended/util/compat_otp/hypeshift_cluster.go
@@ -211,7 +211,7 @@ func ROSAValidHypershiftAndGetGuestKubeConf(oc *exutil.CLI) (string, string, str
 		e2e.Logf("can't get hostedcluster name %s SHARE_DIR: %s", err.Error(), os.Getenv("SHARED_DIR"))
 		return "", "", ""
 	}
-	clusterName := strings.ReplaceAll(string(data), "\n", "")
+	clusterName := strings.TrimSpace(string(data))
 	hostedclusterNS, _ := oc.AsAdmin().WithoutNamespace().Run("get").Args("-A", "hostedclusters", `-o=jsonpath={.items[?(@.metadata.name=="`+clusterName+`")].metadata.namespace}`).Output()
 	if len(hostedclusterNS) <= 0 {
 		e2e.Logf("there is no hosted cluster NS in mgmt cluster")

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func ROSAValidHypershiftAndGetGuestKubeConf(oc *exutil.CLI) (string, string, str`
`211`	`211`	`e2e.Logf("can't get hostedcluster name %s SHARE_DIR: %s", err.Error(), os.Getenv("SHARED_DIR"))`
`212`	`212`	`return "", "", ""`
`213`	`213`	`}`
`214`		`- clusterName := strings.ReplaceAll(string(data), "\n", "")`
	`214`	`+ clusterName := strings.TrimSpace(string(data))`
`215`	`215`	hostedclusterNS, _ := oc.AsAdmin().WithoutNamespace().Run("get").Args("-A", "hostedclusters", `-o=jsonpath={.items[?(@.metadata.name=="`+clusterName+`")].metadata.namespace}`).Output()
`216`	`216`	`if len(hostedclusterNS) <= 0 {`
`217`	`217`	`e2e.Logf("there is no hosted cluster NS in mgmt cluster")`