github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116320 from wangchen615/lastminute-scheduler-fix

Browse Source 
Address last-minute requested changes for inplace update feature testing in scheduler
This commit is contained in:
Kubernetes Prow Robot
2023-03-07 19:31:26 -08:00
committed by GitHub
parent 2abc76161f fd6105d015
commit 83334ccaa1
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/node/pod_resize.go
View File

@@ -1487,8 +1487,12 @@ func doPodResizeSchedulerTests() {
nodeAllocatableMilliCPU := n.Status.Allocatable.Cpu().MilliValue()
gomega.Expect(n.Status.Allocatable != nil)
podAllocatedMilliCPU := int64(0)
listOptions := metav1.ListOptions{FieldSelector: "spec.nodeName=" + n.Name}
// Exclude pods that are in the Succeeded or Failed states
selector := fmt.Sprintf("spec.nodeName=%s,status.phase!=%v,status.phase!=%v", n.Name, v1.PodSucceeded, v1.PodFailed)
listOptions := metav1.ListOptions{FieldSelector: selector}
podList, err := f.ClientSet.CoreV1().Pods(metav1.NamespaceAll).List(context.TODO(), listOptions)
framework.ExpectNoError(err, "failed to get running pods")
framework.Logf("Found %d pods on node '%s'", len(podList.Items), n.Name)
for _, pod := range podList.Items {
@@ -1560,7 +1564,7 @@ func doPodResizeSchedulerTests() {
framework.ExpectEqual(testPod2.Status.Phase, v1.PodPending)
ginkgo.By(fmt.Sprintf("TEST1: Resize pod '%s' to fit in node '%s'", testPod2.Name, node.Name))
testPod2, pErr := f.ClientSet.CoreV1().Pods(testPod2.Namespace).Patch(context.TODO(),
testPod2, pErr := f.ClientSet.CoreV1().Pods(testPod2.Namespace).Patch(ctx,
testPod2.Name, types.StrategicMergePatchType, []byte(patchTestpod2ToFitNode), metav1.PatchOptions{})
framework.ExpectNoError(pErr, "failed to patch pod for resize")
@@ -1629,7 +1633,7 @@ func doPodResizeSchedulerTests() {
})
}
var _ = SIGDescribe("[Serial] Pod InPlace Resize Container (scheduler-focussed) [Feature:InPlacePodVerticalScaling]", func() {
var _ = SIGDescribe("[Serial] Pod InPlace Resize Container (scheduler-focused) [Feature:InPlacePodVerticalScaling]", func() {
doPodResizeSchedulerTests()
})