github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix some unit test error

Browse Source
This commit is contained in:
vivzbansal 2024-11-08 17:13:00 +00:00
parent 1cf4587277
commit 6cf5b80c64
2 changed files with 43 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
pkg/apis/core/validation/validation_test.go
View File

@ -25601,24 +25601,6 @@ func TestValidatePodResize(t *testing.T) {
), ),
)...) )...)
} }
mkPodWithInitCtrs := func(req, lim core.ResourceList, tweaks ...podtest.TweakContainer) *core.Pod {
tweaks = append(tweaks, podtest.SetContainerRestartPolicy(containerRestartPolicyAlways))
return podtest.MakePod("pod",
podtest.SetInitContainers(
podtest.MakeContainer(
"restartable-init",
append(tweaks,
podtest.SetContainerResources(
core.ResourceRequirements{
Requests: req,
Limits: lim,
},
),
)...,
),
),
)
}
mkPodWithInitContainers := func(req, lim core.ResourceList, restartPolicy core.ContainerRestartPolicy, tweaks ...podtest.Tweak) *core.Pod { mkPodWithInitContainers := func(req, lim core.ResourceList, restartPolicy core.ContainerRestartPolicy, tweaks ...podtest.Tweak) *core.Pod {
return podtest.MakePod("pod", append(tweaks, return podtest.MakePod("pod", append(tweaks,
@ -25638,11 +25620,10 @@ func TestValidatePodResize(t *testing.T) {
} }
tests := []struct { tests := []struct {
test string test string
old *core.Pod old *core.Pod
new *core.Pod new *core.Pod
isSideCarCtr bool err string
err string
}{ }{
{ {
test: "pod-level resources with container cpu limit change", test: "pod-level resources with container cpu limit change",
@ -25930,9 +25911,8 @@ func TestValidatePodResize(t *testing.T) {
test: "Pod QoS unchanged, burstable -> burstable, remove cpu and memory requests", test: "Pod QoS unchanged, burstable -> burstable, remove cpu and memory requests",
old: mkPodWithInitContainers(getResources("100m", "100Mi", "", ""), getResources("100m", "", "", ""), ""), old: mkPodWithInitContainers(getResources("100m", "100Mi", "", ""), getResources("100m", "", "", ""), ""),
new: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "", "", ""), ""), new: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "", "", ""), ""),
err: "spec: Forbidden: only cpu and memory resources are mutable", err: "spec: Forbidden: cpu and memory resources for only sidecar containers are mutable",
}, }, {
{
test: "Pod with nil Resource field in Status", test: "Pod with nil Resource field in Status",
old: mkPod(core.ResourceList{}, getResources("100m", "0", "1Gi", ""), podtest.SetStatus(core.PodStatus{ old: mkPod(core.ResourceList{}, getResources("100m", "0", "1Gi", ""), podtest.SetStatus(core.PodStatus{
ContainerStatuses: []core.ContainerStatus{{ ContainerStatuses: []core.ContainerStatus{{
@ -25999,48 +25979,40 @@ func TestValidatePodResize(t *testing.T) {
})), })),
new: mkPod(core.ResourceList{}, getResources("200m", "0", "1Gi", "")), new: mkPod(core.ResourceList{}, getResources("200m", "0", "1Gi", "")),
err: "", err: "",
},
{
test: "cpu limit change for sidecar containers",
old: mkPodWithInitCtrs(core.ResourceList{}, getResources("100m", "0", "1Gi", "")),
new: mkPodWithInitCtrs(core.ResourceList{}, getResources("200m", "0", "1Gi", "")),
isSideCarCtr: true,
err: "",
}, { }, {
test: "memory limit change for sidecar containers", test: "cpu limit change for sidecar containers",
old: mkPodWithInitCtrs(core.ResourceList{}, getResources("100m", "200Mi", "", "")), old: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "0", "1Gi", ""), core.ContainerRestartPolicyAlways),
new: mkPodWithInitCtrs(core.ResourceList{}, getResources("100m", "100Mi", "", "")), new: mkPodWithInitContainers(core.ResourceList{}, getResources("200m", "0", "1Gi", ""), core.ContainerRestartPolicyAlways),
isSideCarCtr: true, err: "",
err: "",
}, { }, {
test: "storage limit change for sidecar containers", test: "memory limit change for sidecar containers",
old: mkPodWithInitCtrs(core.ResourceList{}, getResources("100m", "100Mi", "2Gi", "")), old: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "200Mi", "", ""), core.ContainerRestartPolicyAlways),
new: mkPodWithInitCtrs(core.ResourceList{}, getResources("100m", "100Mi", "1Gi", "")), new: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "100Mi", "", ""), core.ContainerRestartPolicyAlways),
isSideCarCtr: true, err: "",
err: "spec: Forbidden: cpu and memory resources for only sidecar containers are mutable",
}, { }, {
test: "cpu request change for sidecar containers", test: "storage limit change for sidecar containers",
old: mkPodWithInitCtrs(getResources("200m", "0", "", ""), core.ResourceList{}), old: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "100Mi", "2Gi", ""), core.ContainerRestartPolicyAlways),
new: mkPodWithInitCtrs(getResources("100m", "0", "", ""), core.ResourceList{}), new: mkPodWithInitContainers(core.ResourceList{}, getResources("100m", "100Mi", "1Gi", ""), core.ContainerRestartPolicyAlways),
isSideCarCtr: true, err: "spec: Forbidden: cpu and memory resources for only sidecar containers are mutable",
err: "",
}, { }, {
test: "memory request change for sidecar containers", test: "cpu request change for sidecar containers",
old: mkPodWithInitCtrs(getResources("0", "100Mi", "", ""), core.ResourceList{}), old: mkPodWithInitContainers(getResources("200m", "0", "", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
new: mkPodWithInitCtrs(getResources("0", "200Mi", "", ""), core.ResourceList{}), new: mkPodWithInitContainers(getResources("100m", "0", "", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
isSideCarCtr: true, err: "",
err: "",
}, { }, {
test: "storage request change for sidecar containers", test: "memory request change for sidecar containers",
old: mkPodWithInitCtrs(getResources("100m", "0", "1Gi", ""), core.ResourceList{}), old: mkPodWithInitContainers(getResources("0", "100Mi", "", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
new: mkPodWithInitCtrs(getResources("100m", "0", "2Gi", ""), core.ResourceList{}), new: mkPodWithInitContainers(getResources("0", "200Mi", "", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
isSideCarCtr: true, err: "",
err: "spec: Forbidden: cpu and memory resources for only sidecar containers are mutable", }, {
test: "storage request change for sidecar containers",
old: mkPodWithInitContainers(getResources("100m", "0", "1Gi", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
new: mkPodWithInitContainers(getResources("100m", "0", "2Gi", ""), core.ResourceList{}, core.ContainerRestartPolicyAlways),
err: "spec: Forbidden: cpu and memory resources for only sidecar containers are mutable",
}, },
} }
for _, test := range tests { for _, test := range tests {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SidecarContainers, test.isSideCarCtr)
test.new.ObjectMeta.ResourceVersion = "1" test.new.ObjectMeta.ResourceVersion = "1"
test.old.ObjectMeta.ResourceVersion = "1" test.old.ObjectMeta.ResourceVersion = "1"

27
pkg/kubelet/kubelet_test.go
View File

@ -3651,22 +3651,19 @@ func TestIsPodResizeInProgress(t *testing.T) {
name: "resizing cpu limit", name: "resizing cpu limit",
status: mkPodStatus(resizeCPULimitC1Status, steadyStateC2Status), status: mkPodStatus(resizeCPULimitC1Status, steadyStateC2Status),
expectResize: true, expectResize: true,
}, {
name: "resizing cpu request for restartable init container",
status: mkPodStatus(steadyStateC1Status, steadyStateC2Status, resizeCPUReqC3Status),
expectResize: true,
}, {
name: "resizing memory limit for restartable init container",
status: mkPodStatus(steadyStateC1Status, steadyStateC2Status, resizeMemLimitC3Status),
expectResize: true,
}, {
name: "non-restartable init container should be ignored",
status: mkPodStatus(steadyStateC1Status, steadyStateC2Status, steadyStateC3Status, resizeCPUReqC4Status),
expectResize: false,
}, },
{
name: "resizing cpu request for restartable init container",
status: mkPodStatus(steadyStateC1Status, steadyStateC2Status, resizeCPUReqC3Status),
expectResize: true,
},
{
name: "resizing memory limit for restartable init container",
status: mkPodStatus(steadyStateC1Status, steadyStateC2Status, resizeMemLimitC3Status),
expectResize: true,
},
{
name: "non-restartable init container should be ignored",
status: mkPodStatus(steadyStateC1Status, steadyStateC2Status, steadyStateC3Status, resizeCPUReqC4Status),
expectResize: false,
},
} }
for _, test := range tests { for _, test := range tests {