Skip to content

Commit e52274a

Browse files
committed
Don't allow resize policy mutation
1 parent a1595d9 commit e52274a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/apis/core/validation/validation.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5710,7 +5710,6 @@ func dropCPUMemoryResourcesFromContainer(container *core.Container, oldPodSpecCo
57105710
lim := dropCPUMemoryUpdates(container.Resources.Limits, oldPodSpecContainer.Resources.Limits)
57115711
req := dropCPUMemoryUpdates(container.Resources.Requests, oldPodSpecContainer.Resources.Requests)
57125712
container.Resources = core.ResourceRequirements{Limits: lim, Requests: req}
5713-
container.ResizePolicy = oldPodSpecContainer.ResizePolicy // +k8s:verify-mutation:reason=clone
57145713
}
57155714

57165715
// isPodResizeRequestSupported checks whether the pod is running on a node with InPlacePodVerticalScaling enabled.

pkg/apis/core/validation/validation_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26073,6 +26073,16 @@ func TestValidatePodResize(t *testing.T) {
2607326073
old: mkPodWithInitContainers(getResources("100m", "0", "1Gi", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
2607426074
new: mkPodWithInitContainers(getResources("100m", "0", "2Gi", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
2607526075
err: "spec: Forbidden: only cpu and memory resources for sidecar containers are mutable",
26076+
}, {
26077+
test: "change resize restart policy",
26078+
old: mkPod(getResources("100m", "0", "1Gi", ""), core.ResourceList{}, resizePolicy(core.ResourceCPU, core.NotRequired)),
26079+
new: mkPod(getResources("100m", "0", "2Gi", ""), core.ResourceList{}, resizePolicy(core.ResourceCPU, core.RestartContainer)),
26080+
err: "spec: Forbidden: only cpu and memory resources are mutable",
26081+
}, {
26082+
test: "change sidecar container resize restart policy",
26083+
old: mkPodWithInitContainers(getResources("100m", "0", "1Gi", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways, resizePolicy(core.ResourceMemory, core.RestartContainer)),
26084+
new: mkPodWithInitContainers(getResources("100m", "0", "2Gi", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways, resizePolicy(core.ResourceMemory, core.NotRequired)),
26085+
err: "spec: Forbidden: only cpu and memory resources are mutable",
2607626086
},
2607726087
}
2607826088

0 commit comments

Comments
 (0)