Merge pull request kubernetes-sigs#10729 from AbdullahAlShaad/incluster

k8s-ci-robot · web-flow · commit 3327ef7dae9c · 2024-08-02T08:44:30.000-07:00
🌱 Update Config generation to use inClusterConfig
diff --git a/cmd/clusterctl/client/cluster/proxy.go b/cmd/clusterctl/client/cluster/proxy.go
@@ -142,10 +142,13 @@ func (k *proxy) GetConfig() (*rest.Config, error) {
 	}
 	restConfig, err := clientcmd.NewDefaultClientConfig(*config, configOverrides).ClientConfig()
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "invalid configuration:") {
-			return nil, errors.New(strings.Replace(err.Error(), "invalid configuration:", "invalid kubeconfig file; clusterctl requires a valid kubeconfig file to connect to the management cluster:", 1))
+		if !strings.HasPrefix(err.Error(), "invalid configuration:") {
+			return nil, err
+		}
+		restConfig, err = rest.InClusterConfig()
+		if err != nil {
+			return nil, errors.New(strings.Replace(err.Error(), "invalid configuration:", "invalid kubeconfig file and failed to create inClusterConfig as well:", 1))
 		}
-		return nil, err
 	}
 	restConfig.UserAgent = fmt.Sprintf("clusterctl/%s (%s)", version.Get().GitVersion, version.Get().Platform)
 

Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,13 @@ func (k proxy) GetConfig() (rest.Config, error) {`
`142`	`142`	`}`
`143`	`143`	`restConfig, err := clientcmd.NewDefaultClientConfig(*config, configOverrides).ClientConfig()`
`144`	`144`	`if err != nil {`
`145`		`- if strings.HasPrefix(err.Error(), "invalid configuration:") {`
`146`		`- return nil, errors.New(strings.Replace(err.Error(), "invalid configuration:", "invalid kubeconfig file; clusterctl requires a valid kubeconfig file to connect to the management cluster:", 1))`
	`145`	`+ if !strings.HasPrefix(err.Error(), "invalid configuration:") {`
	`146`	`+ return nil, err`
	`147`	`+ }`
	`148`	`+ restConfig, err = rest.InClusterConfig()`
	`149`	`+ if err != nil {`
	`150`	`+ return nil, errors.New(strings.Replace(err.Error(), "invalid configuration:", "invalid kubeconfig file and failed to create inClusterConfig as well:", 1))`
`147`	`151`	`}`
`148`		`- return nil, err`
`149`	`152`	`}`
`150`	`153`	`restConfig.UserAgent = fmt.Sprintf("clusterctl/%s (%s)", version.Get().GitVersion, version.Get().Platform)`
`151`	`154`