Skip to content

K
k3s
Commit 8c517e0a authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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

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
parents adc55115 35671994
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/framework/nodes_util.go
View file @ 8c517e0a
...@@ -50,9 +50,9 @@ func masterUpgradeGCE(rawV string) error { ...@@ -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) { ...@@ -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),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment