Skip to content

Commit 829ae6b

Browse files
committed
Fix VPA admission controller server test
It seems that order of CPU and unobtanium is somewhat random, which was causing flaky tests: kubernetes#2886
1 parent 57f5882 commit 829ae6b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

vertical-pod-autoscaler/pkg/admission-controller/logic/server_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ func TestGetPatchesForResourceRequest_TwoReplacementResources(t *testing.T) {
407407
assertPatchOneOf(t, patches[1], []patchRecord{cpuUpdate, unobtaniumUpdate})
408408
assert.False(t, eqPatch(patches[0], patches[1]))
409409
assertEqPatch(t, patches[2], getAddEmptyAnnotationsPatch())
410-
assertEqPatch(t, patches[3], addAnnotationRequest([][]string{{cpu, unobtanium}}, request))
410+
cpuFirstUnobtaniumSecond := addAnnotationRequest([][]string{{cpu, unobtanium}}, request)
411+
unobtaniumFirstCpuSecond := addAnnotationRequest([][]string{{unobtanium, cpu}}, request)
412+
assertPatchOneOf(t, patches[3], []patchRecord{cpuFirstUnobtaniumSecond, unobtaniumFirstCpuSecond})
411413
assertEqPatch(t, patches[4], addVpaObservedContainersPatch([]string{}))
412414
}
413415
}

0 commit comments

Comments
 (0)