From f6fbf6c6e6dead3a9c8c834f24d1a993f77bf90f Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 10 Feb 2022 18:14:50 +0200 Subject: [PATCH] kubeadm: remove mentions of the x.yy versioned kubelet config CM The legacy naming "kubelet-config-x.yy" is no longer the default behavior. Rename instances in documentation and comments of "kubelet-config-x.yy" to "kubelet-config". --- cmd/kubeadm/app/apis/kubeadm/types.go | 2 +- cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go | 2 +- cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go | 2 +- cmd/kubeadm/app/cmd/phases/init/uploadconfig.go | 4 ++-- cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index 870775251af..c21e1f893a9 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -218,7 +218,7 @@ type NodeRegistrationOptions struct { Taints []v1.Taint // KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file - // kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap + // kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config ConfigMap // Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on. // A key in this map is the flag name as it appears on the // command line except without leading dash(es). diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go index 61484b76277..30037e30d40 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go @@ -207,7 +207,7 @@ type NodeRegistrationOptions struct { Taints []v1.Taint `json:"taints"` // KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file - // kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap + // kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config ConfigMap // Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on. // A key in this map is the flag name as it appears on the // command line except without leading dash(es). diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go index 765ec8c740e..82ae10cc271 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go @@ -221,7 +221,7 @@ type NodeRegistrationOptions struct { Taints []corev1.Taint `json:"taints"` // KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file - // kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap + // kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config ConfigMap // Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on. // A key in this map is the flag name as it appears on the // command line except without leading dash(es). diff --git a/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go b/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go index 504d6c83534..fc758beff9b 100644 --- a/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go +++ b/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go @@ -49,8 +49,8 @@ var ( `) uploadKubeletConfigLongDesc = cmdutil.LongDesc(` - Upload kubelet configuration extracted from the kubeadm InitConfiguration object to a ConfigMap - of the form kubelet-config-1.X in the cluster, where X is the minor version of the current (API Server) Kubernetes version. + Upload the kubelet configuration extracted from the kubeadm InitConfiguration object + to a kubelet-config ConfigMap in the cluster `) uploadKubeletConfigExample = cmdutil.Examples(` diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go index 4c218ee4204..22fd3bff625 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go +++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go @@ -41,9 +41,7 @@ import ( var ( kubeletConfigLongDesc = cmdutil.LongDesc(` - Download the kubelet configuration from a ConfigMap of the form "kubelet-config-1.X" in the cluster, - where X is the minor version of the kubelet. kubeadm uses the KuberneteVersion field in the kubeadm-config - ConfigMap to determine what the _desired_ kubelet version is. + Download the kubelet configuration from the kubelet-config ConfigMap stored in the cluster `) )