Skip to content

Commit c31b1b3

Browse files
committed
Resolved some review comments
1 parent c479f00 commit c31b1b3

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

pkg/apis/core/validation/validation.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5657,23 +5657,23 @@ func ValidatePodResize(newPod, oldPod *core.Pod, opts PodValidationOptions) fiel
56575657
dropCPUMemoryResourcesFromContainer(&container, &oldPod.Spec.InitContainers[ix])
56585658
if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) {
56595659
// This likely means that the user has made changes to resources other than CPU and memory for sidecar container.
5660-
specDiff := cmp.Diff(oldPod.Spec.InitContainers[ix], container)
5661-
errs := field.Forbidden(specPath, fmt.Sprintf("only cpu and memory resources for sidecar containers are mutable\n%v", specDiff))
5660+
errs := field.Forbidden(specPath, "only cpu and memory resources for sidecar containers are mutable")
56625661
allErrs = append(allErrs, errs)
5663-
return allErrs
56645662
}
56655663
} else if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) { // non-restartable init container
56665664
// This likely means that the user has modified resources of non-sidecar init container.
5667-
specDiff := cmp.Diff(oldPod.Spec.InitContainers[ix], container)
5668-
errs := field.Forbidden(specPath, fmt.Sprintf("resources for non-sidecar init containers are immutable\n%v", specDiff))
5665+
errs := field.Forbidden(specPath, "resources for non-sidecar init containers are immutable")
56695666
allErrs = append(allErrs, errs)
5670-
return allErrs
56715667
}
56725668
newInitContainers = append(newInitContainers, container)
56735669
}
56745670
originalCPUMemPodSpec.InitContainers = newInitContainers
56755671
}
56765672

5673+
if len(allErrs) > 0 {
5674+
return allErrs
5675+
}
5676+
56775677
if !apiequality.Semantic.DeepEqual(originalCPUMemPodSpec, oldPod.Spec) {
56785678
// This likely means that the user has made changes to resources other than CPU and Memory.
56795679
specDiff := cmp.Diff(oldPod.Spec, originalCPUMemPodSpec)

pkg/kubelet/kubelet_pods_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6881,6 +6881,9 @@ func TestAllocatedResourcesMatchStatus(t *testing.T) {
68816881

68826882
for _, test := range tests {
68836883
for _, isSidecarContainer := range []bool{false, true} {
6884+
if isSidecarContainer {
6885+
test.name += " " + "for sidecar containers"
6886+
}
68846887
t.Run(test.name, func(t *testing.T) {
68856888
var podStatus *kubecontainer.PodStatus
68866889
state := kubecontainer.ContainerStateRunning

0 commit comments

Comments
 (0)