From 591b0f547ae306cc6992c4e26c92113a7f21f8c2 Mon Sep 17 00:00:00 2001 From: vivzbansal Date: Thu, 7 Nov 2024 05:05:37 +0000 Subject: [PATCH] Fix issue of pod spec mismatch if there is any non-restarble init container present --- pkg/apis/core/validation/validation.go | 4 +--- pkg/registry/core/pod/strategy.go | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 5330c217837..4ca9bba7f42 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -5661,11 +5661,9 @@ func ValidatePodResize(newPod, oldPod *core.Pod, opts PodValidationOptions) fiel req := dropCPUMemoryUpdates(container.Resources.Requests, oldPod.Spec.InitContainers[ix].Resources.Requests) container.Resources = core.ResourceRequirements{Limits: lim, Requests: req} container.ResizePolicy = oldPod.Spec.InitContainers[ix].ResizePolicy // +k8s:verify-mutation:reason=clone - newInitContainers = append(newInitContainers, container) } + newInitContainers = append(newInitContainers, container) } - } - if len(newInitContainers) > 0 { originalCPUMemPodSpec.InitContainers = newInitContainers } diff --git a/pkg/registry/core/pod/strategy.go b/pkg/registry/core/pod/strategy.go index 914cbfbec0a..76a78c0c369 100644 --- a/pkg/registry/core/pod/strategy.go +++ b/pkg/registry/core/pod/strategy.go @@ -319,11 +319,8 @@ func dropNonResizeUpdates(newPod, oldPod *api.Pod) *api.Pod { if !ok { continue } - // Changes are only allowed for restartable init containers. - if podutil.IsRestartableInitContainer(&ctr) { - pod.Spec.InitContainers[idx].Resources = ctr.Resources - pod.Spec.InitContainers[idx].ResizePolicy = ctr.ResizePolicy - } + pod.Spec.InitContainers[idx].Resources = ctr.Resources + pod.Spec.InitContainers[idx].ResizePolicy = ctr.ResizePolicy } }