Merge pull request #68171 from dixudx/fix_e2e_limitrange_update

Automatic merge from submit-queue (batch tested with PRs 68171, 67945, 68233). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. [e2e] verifying LimitRange update is effective before creating new pod **What this PR does / why we need it**: Refer to the flaky test mentioned in #68170, LimitRange updating should be verified before creating new pod. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #68170 **Special notes for your reviewer**: /cc bsalamat k82cn /sig scheduling **Release note**: ```release-note [e2e] verifying LimitRange update is effective before creating new pod ```

Merge pull request #68171 from dixudx/fix_e2e_limitrange_update
2d7b4b04 · Kubernetes Submit Queue · GitHub · a5550441 · e6f32eea · 2d7b4b04
Unverified Commit 2d7b4b04 authored Sep 05, 2018 by Kubernetes Submit Queue Committed by GitHub Sep 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

limit_range.go test/e2e/scheduling/limit_range.go +9 -0

No files found.
--- a/test/e2e/scheduling/limit_range.go
+++ b/test/e2e/scheduling/limit_range.go
@@ -18,6 +18,7 @@ package scheduling

 import (
 	"fmt"
+	"reflect"
 	"time"

 	"k8s.io/api/core/v1"
@@ -81,6 +82,7 @@ var _ = SIGDescribe("LimitRange", func() {

 		By("Fetching the LimitRange to ensure it has proper values")
 		limitRange, err = f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).Get(limitRange.Name, metav1.GetOptions{})
+		Expect(err).NotTo(HaveOccurred())
 		expected := v1.ResourceRequirements{Requests: defaultRequest, Limits: defaultLimit}
 		actual := v1.ResourceRequirements{Requests: limitRange.Spec.Limits[0].DefaultRequest, Limits: limitRange.Spec.Limits[0].Default}
 		err = equalResourceRequirement(expected, actual)
@@ -140,6 +142,13 @@ var _ = SIGDescribe("LimitRange", func() {
 		limitRange, err = f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).Update(limitRange)
 		Expect(err).NotTo(HaveOccurred())

+		By("Verifying LimitRange updating is effective")
+		Expect(wait.Poll(time.Second*2, time.Second*20, func() (bool, error) {
+			limitRange, err = f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).Get(limitRange.Name, metav1.GetOptions{})
+			Expect(err).NotTo(HaveOccurred())
+			return reflect.DeepEqual(limitRange.Spec.Limits[0].Min, newMin), nil
+		})).NotTo(HaveOccurred())
+
 		By("Creating a Pod with less than former min resources")
 		pod = f.NewTestPod(podName, getResourceList("10m", "50Mi", "50Gi"), v1.ResourceList{})
 		pod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)