Merge pull request #30721 from Phaow/hotfix

openshift-merge-bot[bot] · web-flow · commit 21086399e92e · 2026-01-27T17:40:29.000Z
STOR-2838: fix OTP AsGuestKubeconf
diff --git a/test/extended/util/util_otp.go b/test/extended/util/util_otp.go
@@ -243,9 +243,12 @@ func (c *CLI) AsGuestKubeconf() *CLI {
 	// Create a copy of the CLI with guest kubeconfig enabled
 	copy := *c
 	// In OTP this sets a flag and uses guestConfigPath
-	// We'll use the guestConfigPath as the configPath
+	// We'll use the guestConfigPath as the configPath and adminConfigPath to simulate guest kubeconfig usage
+	// We'll also set withoutNamespace to true to comply with OTP behavior: https://github.com/openshift/openshift-tests-private/pull/3841
 	if c.guestConfigPath != "" {
 		copy.configPath = c.guestConfigPath
+		copy.adminConfigPath = c.guestConfigPath
+		copy.withoutNamespace = true
 	}
 	return &copy
 }

Original file line number	Diff line number	Diff line change
`@@ -243,9 +243,12 @@ func (c CLI) AsGuestKubeconf() CLI {`
`243`	`243`	`// Create a copy of the CLI with guest kubeconfig enabled`
`244`	`244`	`copy := *c`
`245`	`245`	`// In OTP this sets a flag and uses guestConfigPath`
`246`		`- // We'll use the guestConfigPath as the configPath`
	`246`	`+ // We'll use the guestConfigPath as the configPath and adminConfigPath to simulate guest kubeconfig usage`
	`247`	`+ // We'll also set withoutNamespace to true to comply with OTP behavior: https://github.com/openshift/openshift-tests-private/pull/3841`
`247`	`248`	`if c.guestConfigPath != "" {`
`248`	`249`	`copy.configPath = c.guestConfigPath`
	`250`	`+ copy.adminConfigPath = c.guestConfigPath`
	`251`	`+ copy.withoutNamespace = true`
`249`	`252`	`}`
`250`	`253`	`return &copy`
`251`	`254`	`}`