mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
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".
This commit is contained in:
parent
66a18df14c
commit
f6fbf6c6e6
@ -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).
|
||||
|
@ -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).
|
||||
|
@ -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).
|
||||
|
@ -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(`
|
||||
|
@ -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
|
||||
`)
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user