Merge pull request #4915 from cheesesashimi/zzlotnik/fix-onclustertesting-helper

openshift-merge-bot[bot] · web-flow · commit d7ef09ef6ed0 · 2025-03-18T04:00:07.000Z
"NO-ISSUE: ensure that client configs are not mutable"
diff --git a/test/framework/clientset.go b/test/framework/clientset.go
@@ -39,9 +39,10 @@ type ClientSet struct {
 	mcfgclient mcfgclientset.Interface
 }
 
-// Allows the instantiation of additional clients with the same config.
+// Returns a copy of the config so that additional clients may be instantiated
+// from it. By making a copy, callers are free to modify the config as needed.
 func (cs *ClientSet) GetRestConfig() *rest.Config {
-	return cs.config
+	return rest.CopyConfig(cs.config)
 }
 
 func (cs *ClientSet) GetKubeconfig() (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,10 @@ type ClientSet struct {`
`39`	`39`	`mcfgclient mcfgclientset.Interface`
`40`	`40`	`}`
`41`	`41`
`42`		`-// Allows the instantiation of additional clients with the same config.`
	`42`	`+// Returns a copy of the config so that additional clients may be instantiated`
	`43`	`+// from it. By making a copy, callers are free to modify the config as needed.`
`43`	`44`	`func (cs ClientSet) GetRestConfig() rest.Config {`
`44`		`- return cs.config`
	`45`	`+ return rest.CopyConfig(cs.config)`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`func (cs *ClientSet) GetKubeconfig() (string, error) {`