upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-11 01:41:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #135807 from carlory/fix-kubeadm-3108

Browse source 
kubeadm: remove --pod-infra-container-image flag from the unwantedFlags list
This commit is contained in:
Kubernetes Prow Robot 2025-12-21 20:32:30 -08:00 committed by GitHub
commit 3bde8d89a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 5 deletions
Show stats 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