Skip to content

Commit e167b44

Browse files
committed
kubeadm: deprecate --kubelet-version command line option
1 parent 0f13c5c commit e167b44

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ var (
3737
kubeletConfigLongDesc = cmdutil.LongDesc(`
3838
Download the kubelet configuration from a ConfigMap of the form "kubelet-config-1.X" in the cluster,
3939
where X is the minor version of the kubelet. kubeadm uses the KuberneteVersion field in the kubeadm-config
40-
ConfigMap to determine what the _desired_ kubelet version is, but the user can override this by using the
41-
--kubelet-version parameter.
40+
ConfigMap to determine what the _desired_ kubelet version is.
4241
`)
4342
)
4443

cmd/kubeadm/app/cmd/upgrade/node.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ func addUpgradeNodeFlags(flagSet *flag.FlagSet, nodeOptions *nodeOptions) {
114114
options.AddKubeConfigFlag(flagSet, &nodeOptions.kubeConfigPath)
115115
flagSet.BoolVar(&nodeOptions.dryRun, options.DryRun, nodeOptions.dryRun, "Do not change any state, just output the actions that would be performed.")
116116
flagSet.StringVar(&nodeOptions.kubeletVersion, options.KubeletVersion, nodeOptions.kubeletVersion, "The *desired* version for the kubelet config after the upgrade. If not specified, the KubernetesVersion from the kubeadm-config ConfigMap will be used")
117+
flagSet.MarkDeprecated(options.KubeletVersion, "This flag is deprecated and will be removed in a future version.")
117118
flagSet.BoolVar(&nodeOptions.renewCerts, options.CertificateRenewal, nodeOptions.renewCerts, "Perform the renewal of certificates used by component changed during upgrades.")
118119
flagSet.BoolVar(&nodeOptions.etcdUpgrade, options.EtcdUpgrade, nodeOptions.etcdUpgrade, "Perform the upgrade of etcd.")
119120
}

0 commit comments

Comments
 (0)