Merge pull request #761 from morlay/kubeconfig-enhance

util: support load Colon-separated KUBECONFIG
pull/776/head
Akihiro Suda 3 years ago committed by GitHub
commit 2b18a9b4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -246,14 +246,15 @@ func driversForNodeGroup(ctx context.Context, dockerCli command.Cli, ng *store.N
func configFromContext(endpointName string, s ctxstore.Reader) (clientcmd.ClientConfig, error) { func configFromContext(endpointName string, s ctxstore.Reader) (clientcmd.ClientConfig, error) {
if strings.HasPrefix(endpointName, "kubernetes://") { if strings.HasPrefix(endpointName, "kubernetes://") {
u, _ := url.Parse(endpointName) u, _ := url.Parse(endpointName)
if kubeconfig := u.Query().Get("kubeconfig"); kubeconfig != "" { if kubeconfig := u.Query().Get("kubeconfig"); kubeconfig != "" {
clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig( _ = os.Setenv(clientcmd.RecommendedConfigPathEnvVar, kubeconfig)
&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig}, }
&clientcmd.ConfigOverrides{}, rules := clientcmd.NewDefaultClientConfigLoadingRules()
) apiConfig, err := rules.Load()
return clientConfig, nil if err != nil {
return nil, err
} }
return clientcmd.NewDefaultClientConfig(*apiConfig, &clientcmd.ConfigOverrides{}), nil
} }
return kubernetes.ConfigFromContext(endpointName, s) return kubernetes.ConfigFromContext(endpointName, s)
} }

Loading…
Cancel
Save