override client config to after config exiss

josemaia · josemaia · commit 00d97d30b4b9 · 2025-03-03T16:47:44.000Z
diff --git a/modules/common/client/init.go b/modules/common/client/init.go
@@ -59,12 +59,13 @@ func (in *configBuilder) buildBaseConfig() (config *rest.Config, err error) {
 		klog.InfoS("Using apiserver-host location", "masterUrl", in.masterUrl)
 	}
 
+	config, err = clientcmd.BuildConfigFromFlags(in.masterUrl, in.kubeconfigPath)
+
 	if len(in.caBundlePath) > 0 {
 		klog.InfoS("Using custom CA Bundle", "caBundle", in.caBundlePath)
 		config.TLSClientConfig.CAFile = in.caBundlePath
 	}
 
-	config, err = clientcmd.BuildConfigFromFlags(in.masterUrl, in.kubeconfigPath)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,13 @@ func (in configBuilder) buildBaseConfig() (config rest.Config, err error) {`
`59`	`59`	`klog.InfoS("Using apiserver-host location", "masterUrl", in.masterUrl)`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ config, err = clientcmd.BuildConfigFromFlags(in.masterUrl, in.kubeconfigPath)`
	`63`	`+`
`62`	`64`	`if len(in.caBundlePath) > 0 {`
`63`	`65`	`klog.InfoS("Using custom CA Bundle", "caBundle", in.caBundlePath)`
`64`	`66`	`config.TLSClientConfig.CAFile = in.caBundlePath`
`65`	`67`	`}`
`66`	`68`
`67`		`- config, err = clientcmd.BuildConfigFromFlags(in.masterUrl, in.kubeconfigPath)`
`68`	`69`	`if err != nil {`
`69`	`70`	`return nil, err`
`70`	`71`	`}`