Skip to content

Commit 542c2a6

Browse files
HirazawaUiSoulPancake
authored andcommitted
move deprecated version of pod-infra-container-image args to 1.32
1 parent 179ef08 commit 542c2a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmd/kubelet/app/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ is checked every 20 seconds (also configurable with a flag).`,
204204

205205
if cleanFlagSet.Changed("pod-infra-container-image") {
206206
klog.InfoS("--pod-infra-container-image will not be pruned by the image garbage collector in kubelet and should also be set in the remote runtime")
207-
_ = cmd.Flags().MarkDeprecated("pod-infra-container-image", "--pod-infra-container-image will be removed in 1.30. Image garbage collector will get sandbox image information from CRI.")
207+
_ = cmd.Flags().MarkDeprecated("pod-infra-container-image", "--pod-infra-container-image will be removed in 1.32. Image garbage collector will get sandbox image information from CRI.")
208208
}
209209

210210
// load kubelet config file, if provided

pkg/kubelet/config/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (s *ContainerRuntimeOptions) AddFlags(fs *pflag.FlagSet) {
5151
// General settings.
5252
fs.StringVar(&s.RuntimeCgroups, "runtime-cgroups", s.RuntimeCgroups, "Optional absolute name of cgroups to create and run the runtime in.")
5353
fs.StringVar(&s.PodSandboxImage, "pod-infra-container-image", s.PodSandboxImage, fmt.Sprintf("Specified image will not be pruned by the image garbage collector. CRI implementations have their own configuration to set this image."))
54-
fs.MarkDeprecated("pod-infra-container-image", "will be removed in a future release. Image garbage collector will get sandbox image information from CRI.")
54+
_ = fs.MarkDeprecated("pod-infra-container-image", "will be removed in 1.32. Image garbage collector will get sandbox image information from CRI.")
5555

5656
// Image credential provider settings.
5757
fs.StringVar(&s.ImageCredentialProviderConfigFile, "image-credential-provider-config", s.ImageCredentialProviderConfigFile, "The path to the credential provider plugin config file.")

0 commit comments

Comments
 (0)