From 5d3513e5b60fb26db519ae1e72439f7c479a5d57 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Mon, 12 Nov 2018 11:17:09 -0800 Subject: [PATCH 1/2] if hpa already exists, delete it --- test/e2e/kubernetes/kubernetes_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index 1636e6a5f2..0ae1978303 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -574,6 +574,13 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu It("should be able to autoscale", func() { if eng.HasLinuxAgents() && eng.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.EnableAggregatedAPIs { + // "Pre"-delete the hpa in case a prior delete attempt failed, for long-running cluster scenarios + h, err := hpa.Get(longRunningApacheDeploymentName, "default") + if err == nil { + h.Delete(deleteResourceRetries) + // Wait a minute before proceeding to create a new hpa w/ the same name + time.Sleep(1 * time.Minute) + } By("Getting the long-running php-apache deployment") // Inspired by http://blog.kubernetes.io/2016/07/autoscaling-in-kubernetes.html r := rand.New(rand.NewSource(time.Now().UnixNano())) From 0a9165a9e4450764160a61b713c1e106018d7c3b Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Mon, 12 Nov 2018 11:57:17 -0800 Subject: [PATCH 2/2] i heart golang --- test/e2e/kubernetes/kubernetes_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index 0ae1978303..292ff5a680 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -634,7 +634,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu By("Ensuring we only have 1 apache-php pod after stopping load") _, err = phpApacheDeploy.WaitForReplicas(-1, 1, 5*time.Second, cfg.Timeout) Expect(err).NotTo(HaveOccurred()) - h, err := hpa.Get(longRunningApacheDeploymentName, "default") + h, err = hpa.Get(longRunningApacheDeploymentName, "default") Expect(err).NotTo(HaveOccurred()) By("Deleting HPA configuration")