Skip to content

Commit 7dc2e2b

Browse files
Update Config generation to use inClusterConfig
Signed-off-by: AbdullahAlShaad <[email protected]>
1 parent ad80008 commit 7dc2e2b

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

cmd/clusterctl/client/cluster/proxy.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"k8s.io/client-go/kubernetes"
3535
"k8s.io/client-go/rest"
3636
"k8s.io/client-go/tools/clientcmd"
37+
ctrl "sigs.k8s.io/controller-runtime"
3738
"sigs.k8s.io/controller-runtime/pkg/client"
3839

3940
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -131,22 +132,7 @@ func (k *proxy) ValidateKubernetesVersion() error {
131132

132133
// GetConfig returns the config for a kubernetes client.
133134
func (k *proxy) GetConfig() (*rest.Config, error) {
134-
config, err := k.configLoadingRules.Load()
135-
if err != nil {
136-
return nil, errors.Wrap(err, "failed to load Kubeconfig")
137-
}
138-
139-
configOverrides := &clientcmd.ConfigOverrides{
140-
CurrentContext: k.kubeconfig.Context,
141-
Timeout: k.timeout.String(),
142-
}
143-
restConfig, err := clientcmd.NewDefaultClientConfig(*config, configOverrides).ClientConfig()
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))
147-
}
148-
return nil, err
149-
}
135+
restConfig := ctrl.GetConfigOrDie()
150136
restConfig.UserAgent = fmt.Sprintf("clusterctl/%s (%s)", version.Get().GitVersion, version.Get().Platform)
151137

152138
// Set QPS and Burst to a threshold that ensures the controller runtime client/client go doesn't generate throttling log messages

0 commit comments

Comments
 (0)