github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: remove mentions of the x.yy versioned kubelet config CM

Browse Source 
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".
This commit is contained in:
Lubomir I. Ivanov 2022-02-10 18:14:50 +02:00
parent 66a18df14c
commit f6fbf6c6e6
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/apis/kubeadm/types.go
View File

@ -218,7 +218,7 @@ type NodeRegistrationOptions struct {
Taints []v1.Taint 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 // 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. // 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 // A key in this map is the flag name as it appears on the
// command line except without leading dash(es). // command line except without leading dash(es).

2
cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go
View File

@ -207,7 +207,7 @@ type NodeRegistrationOptions struct {
Taints []v1.Taint `json:"taints"` 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 // 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. // 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 // A key in this map is the flag name as it appears on the
// command line except without leading dash(es). // command line except without leading dash(es).

2
cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go
View File

@ -221,7 +221,7 @@ type NodeRegistrationOptions struct {
Taints []corev1.Taint `json:"taints"` 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 // 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. // 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 // A key in this map is the flag name as it appears on the
// command line except without leading dash(es). // command line except without leading dash(es).

4
cmd/kubeadm/app/cmd/phases/init/uploadconfig.go
View File

@ -49,8 +49,8 @@ var (
`) `)
uploadKubeletConfigLongDesc = cmdutil.LongDesc(` uploadKubeletConfigLongDesc = cmdutil.LongDesc(`
Upload kubelet configuration extracted from the kubeadm InitConfiguration object to a ConfigMap Upload the kubelet configuration extracted from the kubeadm InitConfiguration object
of the form kubelet-config-1.X in the cluster, where X is the minor version of the current (API Server) Kubernetes version. to a kubelet-config ConfigMap in the cluster
`) `)
uploadKubeletConfigExample = cmdutil.Examples(` uploadKubeletConfigExample = cmdutil.Examples(`

4
cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go
View File

@ -41,9 +41,7 @@ import (
var ( var (
kubeletConfigLongDesc = cmdutil.LongDesc(` kubeletConfigLongDesc = cmdutil.LongDesc(`
Download the kubelet configuration from a ConfigMap of the form "kubelet-config-1.X" in the cluster, Download the kubelet configuration from the kubelet-config ConfigMap stored 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.
`) `)
) )