github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27135 from jlowdermilk/fix-upgrade-tests

Browse Source 
Automatic merge from submit-queue

Fix GKE upgrade e2e util.

containers command group at HEAD no longer accepts --zone. Flag
has to be specified after subcommand group. Fix #27011
This commit is contained in:
k8s-merge-robot 2016-06-09 18:32:53 -07:00 committed by GitHub
commit 8c517e0aa7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/framework/nodes_util.go
View File

@ -50,9 +50,9 @@ func masterUpgradeGCE(rawV string) error {
func masterUpgradeGKE(v string) error { func masterUpgradeGKE(v string) error {
Logf("Upgrading master to %q", v) Logf("Upgrading master to %q", v)
_, _, err := RunCmd("gcloud", "container", _, _, err := RunCmd("gcloud", "container",
"clusters",
fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID), fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID),
fmt.Sprintf("--zone=%s", TestContext.CloudConfig.Zone), fmt.Sprintf("--zone=%s", TestContext.CloudConfig.Zone),
"clusters",
"upgrade", "upgrade",
TestContext.CloudConfig.Cluster, TestContext.CloudConfig.Cluster,
"--master", "--master",
@ -252,9 +252,9 @@ func cleanupNodeUpgradeGCE(tmplBefore string) {
func nodeUpgradeGKE(v string) error { func nodeUpgradeGKE(v string) error {
Logf("Upgrading nodes to %q", v) Logf("Upgrading nodes to %q", v)
_, _, err := RunCmd("gcloud", "container", _, _, err := RunCmd("gcloud", "container",
"clusters",
fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID), fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID),
fmt.Sprintf("--zone=%s", TestContext.CloudConfig.Zone), fmt.Sprintf("--zone=%s", TestContext.CloudConfig.Zone),
"clusters",
"upgrade", "upgrade",
TestContext.CloudConfig.Cluster, TestContext.CloudConfig.Cluster,
fmt.Sprintf("--cluster-version=%s", v), fmt.Sprintf("--cluster-version=%s", v),