github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 20:00:07 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: remove --pod-infra-container-image flag from the unwantedFlags list

Browse Source 
Signed-off-by: carlory <baofa.fan@daocloud.io>
This commit is contained in:
carlory
2025-12-18 15:52:04 +08:00
parent 04d87a4b6e
commit e3c0292431
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/cmd/phases/upgrade/postupgrade.go
View File

@@ -48,11 +48,7 @@ func runPostUpgrade(c workflow.RunData) error {
// Rewrite the kubelet env file without unwanted flags to disk and print the remaining flags instead of dry-running.
// If not dry-running, the kubelet env file will be backed up to the /etc/kubernetes/tmp/ dir, so that it could be
// recovered if anything goes wrong.
unwantedFlags := []string{
// The flag has been deprecated and no longer served a purpose in the kubelet as the logic was migrated to CRI.
// TODO: Remove it from this list in 1.36: https://github.com/kubernetes/kubeadm/issues/3108
"pod-infra-container-image",
}
unwantedFlags := []string{}
err := upgrade.RemoveKubeletArgsFromFile(data.KubeletDir(), data.KubeConfigDir(), unwantedFlags, data.DryRun(), data.OutputWriter())
if err != nil {
return err