Skip to content

Commit 9d0ae5e

Browse files
committed
removed test for same name check, not a valid case
1 parent b237dc8 commit 9d0ae5e

File tree

2 files changed

+3
-28
lines changed

2 files changed

+3
-28
lines changed

vertical-pod-autoscaler/pkg/utils/resources/resourcehelpers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ func containerStatusFor(containerName string, containerStatuses []v1.ContainerSt
7474
}
7575

7676
func isInitContainer(containerName string, pod *v1.Pod) bool {
77-
for _, container := range pod.Spec.Containers {
77+
for _, container := range pod.Spec.InitContainers {
7878
if container.Name == containerName {
79-
return false
79+
return true
8080
}
8181
}
82-
return true
82+
return false
8383
}

vertical-pod-autoscaler/pkg/utils/resources/resourcehelpers_test.go

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -106,31 +106,6 @@ func TestContainerRequestsAndLimits(t *testing.T) {
106106
wantRequests: nil,
107107
wantLimits: nil,
108108
},
109-
{
110-
desc: "Init container with the same name as the container is ignored",
111-
containerName: "container-1",
112-
pod: test.Pod().AddInitContainer(
113-
test.Container().WithName("container-1").
114-
WithCPURequest(resource.MustParse("1")).
115-
WithMemRequest(resource.MustParse("10Mi")).
116-
WithCPULimit(resource.MustParse("2")).
117-
WithMemLimit(resource.MustParse("20Mi")).Get()).
118-
AddContainer(
119-
test.Container().WithName("container-1").
120-
WithCPURequest(resource.MustParse("4")).
121-
WithMemRequest(resource.MustParse("40Mi")).
122-
WithCPULimit(resource.MustParse("5")).
123-
WithMemLimit(resource.MustParse("50Mi")).Get()).
124-
Get(),
125-
wantRequests: apiv1.ResourceList{
126-
apiv1.ResourceCPU: resource.MustParse("4"),
127-
apiv1.ResourceMemory: resource.MustParse("40Mi"),
128-
},
129-
wantLimits: apiv1.ResourceList{
130-
apiv1.ResourceCPU: resource.MustParse("5"),
131-
apiv1.ResourceMemory: resource.MustParse("50Mi"),
132-
},
133-
},
134109
{
135110
desc: "InitContainer selected",
136111
containerName: "container",

0 commit comments

Comments
 (0)