Commit ec6c2194 authored by Darren Shepherd's avatar Darren Shepherd

fix dynamic config feature?

parent 1c86ee30
...@@ -50,6 +50,7 @@ import ( ...@@ -50,6 +50,7 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
certutil "k8s.io/client-go/util/cert" certutil "k8s.io/client-go/util/cert"
"k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/cmd/kubelet/app/options"
...@@ -716,10 +717,17 @@ func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletCo ...@@ -716,10 +717,17 @@ func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletCo
return tlsOptions, nil return tlsOptions, nil
} }
func kubeconfigClientConfig(s *options.KubeletServer) (*restclient.Config, error) {
return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
&clientcmd.ClientConfigLoadingRules{ExplicitPath: s.KubeConfig},
&clientcmd.ConfigOverrides{},
).ClientConfig()
}
// createClientConfig creates a client configuration from the command line arguments. // createClientConfig creates a client configuration from the command line arguments.
// If --kubeconfig is explicitly set, it will be used. // If --kubeconfig is explicitly set, it will be used.
func createClientConfig(s *options.KubeletServer) (*restclient.Config, error) { func createClientConfig(s *options.KubeletServer) (*restclient.Config, error) {
return nil, fmt.Errorf("createClientConfig called in standalone mode") return kubeconfigClientConfig(s)
} }
// createAPIServerClientConfig generates a client.Config from command line flags // createAPIServerClientConfig generates a client.Config from command line flags
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment