From 7072a50aeac393127714c78f00e10465f48c428f Mon Sep 17 00:00:00 2001
From: Maciej Pytel <maciekpytel@google.com>
Date: Tue, 20 Jun 2017 16:37:20 +0200
Subject: [PATCH] Further reduce cluster-autoscaler e2e flakiness

Add pdbs for additional kube-system pod, move adding
pdbs to separate function, as it will need to be reused
in new tests we're working on.
---
 .../autoscaling/cluster_size_autoscaling.go   | 75 ++++++++++++-------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go
index b5b851c984c3..3c38a49864b3 100644
--- a/test/e2e/autoscaling/cluster_size_autoscaling.go
+++ b/test/e2e/autoscaling/cluster_size_autoscaling.go
@@ -346,32 +346,9 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() {
 	})
 
 	simpleScaleDownTest := func(unready int) {
-		// This is a temporary fix to allow CA to migrate some kube-system pods
-		// TODO: Remove this when the PDB is added for those components
-		By("Create PodDisruptionBudgets for kube-system components, so they can be migrated if required")
-		pdbsToAdd := []string{"kube-dns-autoscaler", "kube-dns"}
-		for _, pdbLabel := range pdbsToAdd {
-			By(fmt.Sprintf("Create PodDisruptionBudget for %v", pdbLabel))
-			labelMap := map[string]string{"k8s-app": pdbLabel}
-			pdbName := fmt.Sprintf("test-pdb-for-%v", pdbLabel)
-			minAvailable := intstr.FromInt(1)
-			pdb := &policy.PodDisruptionBudget{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      pdbName,
-					Namespace: "kube-system",
-				},
-				Spec: policy.PodDisruptionBudgetSpec{
-					Selector:     &metav1.LabelSelector{MatchLabels: labelMap},
-					MinAvailable: &minAvailable,
-				},
-			}
-			_, err := f.StagingClient.Policy().PodDisruptionBudgets("kube-system").Create(pdb)
-
-			defer func() {
-				f.StagingClient.Policy().PodDisruptionBudgets("kube-system").Delete(pdbName, &metav1.DeleteOptions{})
-			}()
-			framework.ExpectNoError(err)
-		}
+		cleanup, err := addKubeSystemPdbs(f)
+		defer cleanup()
+		framework.ExpectNoError(err)
 
 		By("Manually increase cluster size")
 		increasedSize := 0
@@ -1081,3 +1058,49 @@ func waitForScaleUpStatus(c clientset.Interface, expected string, timeout time.D
 	}
 	return nil, fmt.Errorf("ScaleUp status did not reach expected value: %v", expected)
 }
+
+// This is a temporary fix to allow CA to migrate some kube-system pods
+// TODO: Remove this when the PDB is added for those components
+func addKubeSystemPdbs(f *framework.Framework) (func(), error) {
+	By("Create PodDisruptionBudgets for kube-system components, so they can be migrated if required")
+
+	newPdbs := make([]string, 0)
+	cleanup := func() {
+		for _, newPdbName := range newPdbs {
+			f.StagingClient.Policy().PodDisruptionBudgets("kube-system").Delete(newPdbName, &metav1.DeleteOptions{})
+		}
+	}
+
+	type pdbInfo struct {
+		label         string
+		min_available int
+	}
+	pdbsToAdd := []pdbInfo{
+		{label: "kube-dns-autoscaler", min_available: 1},
+		{label: "kube-dns", min_available: 1},
+		{label: "event-exporter", min_available: 0},
+	}
+	for _, pdbData := range pdbsToAdd {
+		By(fmt.Sprintf("Create PodDisruptionBudget for %v", pdbData.label))
+		labelMap := map[string]string{"k8s-app": pdbData.label}
+		pdbName := fmt.Sprintf("test-pdb-for-%v", pdbData.label)
+		minAvailable := intstr.FromInt(pdbData.min_available)
+		pdb := &policy.PodDisruptionBudget{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      pdbName,
+				Namespace: "kube-system",
+			},
+			Spec: policy.PodDisruptionBudgetSpec{
+				Selector:     &metav1.LabelSelector{MatchLabels: labelMap},
+				MinAvailable: &minAvailable,
+			},
+		}
+		_, err := f.StagingClient.Policy().PodDisruptionBudgets("kube-system").Create(pdb)
+		newPdbs = append(newPdbs, pdbName)
+
+		if err != nil {
+			return cleanup, err
+		}
+	}
+	return cleanup, nil
+}