From a20ff91c4c935e22656a767f10d7e27a6c24ba3f Mon Sep 17 00:00:00 2001 From: Patrice Peterson Date: Wed, 18 Jul 2018 17:52:09 +0200 Subject: [PATCH] kubeadm: stop setting UID in the kubelet ConfigMap Fixes #921. --- cmd/kubeadm/app/phases/kubelet/BUILD | 1 - cmd/kubeadm/app/phases/kubelet/dynamic.go | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/kubeadm/app/phases/kubelet/BUILD b/cmd/kubeadm/app/phases/kubelet/BUILD index f6c8c9130a1..e44834674c4 100644 --- a/cmd/kubeadm/app/phases/kubelet/BUILD +++ b/cmd/kubeadm/app/phases/kubelet/BUILD @@ -28,7 +28,6 @@ go_library( "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", diff --git a/cmd/kubeadm/app/phases/kubelet/dynamic.go b/cmd/kubeadm/app/phases/kubelet/dynamic.go index 8f3e0685015..602182a7603 100644 --- a/cmd/kubeadm/app/phases/kubelet/dynamic.go +++ b/cmd/kubeadm/app/phases/kubelet/dynamic.go @@ -21,7 +21,6 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" clientset "k8s.io/client-go/kubernetes" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" @@ -38,23 +37,22 @@ func EnableDynamicConfigForNode(client clientset.Interface, nodeName string, kub nodeName, configMapName, metav1.NamespaceSystem) fmt.Println("[kubelet] WARNING: The Dynamic Kubelet Config feature is beta, but off by default. It hasn't been well-tested yet at this stage, use with caution.") - kubeletConfigMap, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(configMapName, metav1.GetOptions{}) + _, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(configMapName, metav1.GetOptions{}) if err != nil { return fmt.Errorf("couldn't get the kubelet configuration ConfigMap: %v", err) } // Loop on every falsy return. Return with an error if raised. Exit successfully if true is returned. return apiclient.PatchNode(client, nodeName, func(n *v1.Node) { - patchNodeForDynamicConfig(n, configMapName, kubeletConfigMap.UID) + patchNodeForDynamicConfig(n, configMapName) }) } -func patchNodeForDynamicConfig(n *v1.Node, configMapName string, configMapUID types.UID) { +func patchNodeForDynamicConfig(n *v1.Node, configMapName string) { n.Spec.ConfigSource = &v1.NodeConfigSource{ ConfigMap: &v1.ConfigMapNodeConfigSource{ Name: configMapName, Namespace: metav1.NamespaceSystem, - UID: configMapUID, KubeletConfigKey: kubeadmconstants.KubeletBaseConfigurationConfigMapKey, }, }