From e3c0292431f4e661236f441620178b405dd59016 Mon Sep 17 00:00:00 2001 From: carlory Date: Thu, 18 Dec 2025 15:52:04 +0800 Subject: [PATCH] kubeadm: remove --pod-infra-container-image flag from the unwantedFlags list Signed-off-by: carlory --- cmd/kubeadm/app/cmd/phases/upgrade/postupgrade.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/cmd/phases/upgrade/postupgrade.go index cdb05a42c08..5cb63af2280 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/cmd/phases/upgrade/postupgrade.go @@ -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