From 356719943242d720ef1ff38fd0e3ee57862fbba5 Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Thu, 9 Jun 2016 10:47:12 -0700 Subject: [PATCH] Fix GKE upgrade e2e util. containers command group at HEAD no longer accepts --zone. Flag has to be specified after subcommand group. --- test/e2e/framework/nodes_util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index e2f9aae82bb..1a9399aace6 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -50,9 +50,9 @@ func masterUpgradeGCE(rawV string) error { func masterUpgradeGKE(v string) error { Logf("Upgrading master to %q", v) _, _, err := RunCmd("gcloud", "container", + "clusters", fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID), fmt.Sprintf("--zone=%s", TestContext.CloudConfig.Zone), - "clusters", "upgrade", TestContext.CloudConfig.Cluster, "--master", @@ -252,9 +252,9 @@ func cleanupNodeUpgradeGCE(tmplBefore string) { func nodeUpgradeGKE(v string) error { Logf("Upgrading nodes to %q", v) _, _, err := RunCmd("gcloud", "container", + "clusters", fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID), fmt.Sprintf("--zone=%s", TestContext.CloudConfig.Zone), - "clusters", "upgrade", TestContext.CloudConfig.Cluster, fmt.Sprintf("--cluster-version=%s", v),