From c31b1b3332f6b5c229490d555ba9b44d99d30aa1 Mon Sep 17 00:00:00 2001 From: vivzbansal Date: Tue, 7 Jan 2025 07:21:25 +0000 Subject: [PATCH] Resolved some review comments --- pkg/apis/core/validation/validation.go | 12 ++++++------ pkg/kubelet/kubelet_pods_test.go | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 1d1966d9b9f..db0061825ed 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -5657,23 +5657,23 @@ func ValidatePodResize(newPod, oldPod *core.Pod, opts PodValidationOptions) fiel dropCPUMemoryResourcesFromContainer(&container, &oldPod.Spec.InitContainers[ix]) if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) { // This likely means that the user has made changes to resources other than CPU and memory for sidecar container. - specDiff := cmp.Diff(oldPod.Spec.InitContainers[ix], container) - errs := field.Forbidden(specPath, fmt.Sprintf("only cpu and memory resources for sidecar containers are mutable\n%v", specDiff)) + errs := field.Forbidden(specPath, "only cpu and memory resources for sidecar containers are mutable") allErrs = append(allErrs, errs) - return allErrs } } else if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) { // non-restartable init container // This likely means that the user has modified resources of non-sidecar init container. - specDiff := cmp.Diff(oldPod.Spec.InitContainers[ix], container) - errs := field.Forbidden(specPath, fmt.Sprintf("resources for non-sidecar init containers are immutable\n%v", specDiff)) + errs := field.Forbidden(specPath, "resources for non-sidecar init containers are immutable") allErrs = append(allErrs, errs) - return allErrs } newInitContainers = append(newInitContainers, container) } originalCPUMemPodSpec.InitContainers = newInitContainers } + if len(allErrs) > 0 { + return allErrs + } + if !apiequality.Semantic.DeepEqual(originalCPUMemPodSpec, oldPod.Spec) { // This likely means that the user has made changes to resources other than CPU and Memory. specDiff := cmp.Diff(oldPod.Spec, originalCPUMemPodSpec) diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index 1f0679445bd..ad0b3a79c75 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -6881,6 +6881,9 @@ func TestAllocatedResourcesMatchStatus(t *testing.T) { for _, test := range tests { for _, isSidecarContainer := range []bool{false, true} { + if isSidecarContainer { + test.name += " " + "for sidecar containers" + } t.Run(test.name, func(t *testing.T) { var podStatus *kubecontainer.PodStatus state := kubecontainer.ContainerStateRunning