From 92117f69e3a89c04a64b680e982d67cec780a7b0 Mon Sep 17 00:00:00 2001 From: Lion-Wei Date: Fri, 24 Nov 2017 16:58:04 +0800 Subject: [PATCH] add kube config file of kube-proxy to kube-proxy config map --- cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go index 88581a1dc0a..948956e46d9 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go @@ -65,6 +65,8 @@ const ( DefaultProxyBindAddressv4 = "0.0.0.0" // DefaultProxyBindAddressv6 is the default bind address when the advertise address is v6 DefaultProxyBindAddressv6 = "::" + // KubeproxyKubeConfigFileName efines the file name for the kube-proxy's KubeConfig file + KubeproxyKubeConfigFileName = "/var/lib/kube-proxy/kubeconfig.conf" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { @@ -127,6 +129,10 @@ func SetDefaults_ProxyConfiguration(obj *MasterConfiguration) { obj.KubeProxy.Config.ClusterCIDR = obj.Networking.PodSubnet } + if obj.KubeProxy.Config.ClientConnection.KubeConfigFile == "" { + obj.KubeProxy.Config.ClientConnection.KubeConfigFile = KubeproxyKubeConfigFileName + } + kubeproxyscheme.Scheme.Default(obj.KubeProxy.Config) }