mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
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
This commit is contained in:
commit
8c517e0aa7
@ -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),
|
||||
|
Loading…
Reference in New Issue
Block a user