From db6c34288e49c50427bc10827befc9021722dd94 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Mon, 17 Aug 2015 21:09:08 +0200 Subject: [PATCH] Migrated Autoscaling e2e test to new gcloud commands --- test/e2e/autoscaling.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/e2e/autoscaling.go b/test/e2e/autoscaling.go index 221a171841d..f6544b98b62 100644 --- a/test/e2e/autoscaling.go +++ b/test/e2e/autoscaling.go @@ -94,14 +94,11 @@ var _ = Describe("Autoscaling", func() { func setUpAutoscaler(metric string, target float64, min, max int) { // TODO integrate with kube-up.sh script once it will support autoscaler setup. By("Setting up autoscaler to scale based on " + metric) - out, err := exec.Command("gcloud", "preview", "autoscaler", - "--zone="+testContext.CloudConfig.Zone, - "create", "e2e-test-autoscaler", + out, err := exec.Command("gcloud", "compute", "instance-groups", "managed", "set-autoscaling", + testContext.CloudConfig.NodeInstanceGroup, "--project="+testContext.CloudConfig.ProjectID, - "--target="+testContext.CloudConfig.NodeInstanceGroup, - "--custom-metric=custom.cloudmonitoring.googleapis.com/kubernetes.io/"+metric, - fmt.Sprintf("--target-custom-metric-utilization=%v", target), - "--custom-metric-utilization-target-type=GAUGE", + "--zone="+testContext.CloudConfig.Zone, + "--custom-metric-utilization=metric=custom.cloudmonitoring.googleapis.com/kubernetes.io/"+metric+fmt.Sprintf(",utilization-target=%v", target)+",utilization-target-type=GAUGE", fmt.Sprintf("--min-num-replicas=%v", min), fmt.Sprintf("--max-num-replicas=%v", max), ).CombinedOutput() @@ -110,7 +107,11 @@ func setUpAutoscaler(metric string, target float64, min, max int) { func cleanUpAutoscaler() { By("Removing autoscaler") - out, err := exec.Command("gcloud", "preview", "autoscaler", "--zone="+testContext.CloudConfig.Zone, "delete", "e2e-test-autoscaler").CombinedOutput() + out, err := exec.Command("gcloud", "compute", "instance-groups", "managed", "stop-autoscaling", + testContext.CloudConfig.NodeInstanceGroup, + "--project="+testContext.CloudConfig.ProjectID, + "--zone="+testContext.CloudConfig.Zone, + ).CombinedOutput() expectNoError(err, "Output: "+string(out)) }