Merge pull request #40340 from smarterclayton/12605

Automatic merge from submit-queue (batch tested with PRs 40215, 40340, 39523) Retry resource quota lookup until count stabilizes On contended servers the service account controller can slow down, leading to the count changing during a run. Wait up to 5s for the count to stabilize, assuming that updates come at a consistent rate, and are not held indefinitely. Upstream of openshift/origin#12605 (we create more secrets and flake more often)

Merge pull request #40340 from smarterclayton/12605
f9b3e739 · Kubernetes Submit Queue · GitHub · 243dd9e4 · 8a303b99 · f9b3e739
Commit f9b3e739 authored Jan 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 5 deletions

resource_quota.go test/e2e/resource_quota.go +16 -5

No files found.
--- a/test/e2e/resource_quota.go
+++ b/test/e2e/resource_quota.go
@@ -93,16 +93,27 @@ var _ = framework.KubeDescribe("ResourceQuota", func() {

 	It("should create a ResourceQuota and capture the life of a secret.", func() {
 		By("Discovering how many secrets are in namespace by default")
-		secrets, err := f.ClientSet.Core().Secrets(f.Namespace.Name).List(metav1.ListOptions{})
-		Expect(err).NotTo(HaveOccurred())
-		defaultSecrets := fmt.Sprintf("%d", len(secrets.Items))
-		hardSecrets := fmt.Sprintf("%d", len(secrets.Items)+1)
+		found, unchanged := 0, 0
+		wait.Poll(1*time.Second, 30*time.Second, func() (bool, error) {
+			secrets, err := f.ClientSet.Core().Secrets(f.Namespace.Name).List(metav1.ListOptions{})
+			Expect(err).NotTo(HaveOccurred())
+			if len(secrets.Items) == found {
+				// loop until the number of secrets has stabilized for 5 seconds
+				unchanged++
+				return unchanged > 4, nil
+			}
+			unchanged = 0
+			found = len(secrets.Items)
+			return false, nil
+		})
+		defaultSecrets := fmt.Sprintf("%d", found)
+		hardSecrets := fmt.Sprintf("%d", found+1)

 		By("Creating a ResourceQuota")
 		quotaName := "test-quota"
 		resourceQuota := newTestResourceQuota(quotaName)
 		resourceQuota.Spec.Hard[v1.ResourceSecrets] = resource.MustParse(hardSecrets)
-		resourceQuota, err = createResourceQuota(f.ClientSet, f.Namespace.Name, resourceQuota)
+		resourceQuota, err := createResourceQuota(f.ClientSet, f.Namespace.Name, resourceQuota)
 		Expect(err).NotTo(HaveOccurred())

 		By("Ensuring resource quota status is calculated")