Merge pull request kubernetes#119603 from borg-land/machine-type-fix

Calculate the correct machine-type
openshift · Jul 28, 2023 · 97c7dbc · 97c7dbc
2 parents d4fde1e + a65d207
commit 97c7dbc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/test/e2e_node/remote/gce/gce_runner.go b/test/e2e_node/remote/gce/gce_runner.go
@@ -768,12 +768,15 @@ func (g *GCERunner) updateKernelArguments(instance *compute.Instance, image stri
 }
 
 func (g *GCERunner) machineType(machine string) string {
+	var ret string
 	if machine == "" && *instanceType != "" {
-		machine = *instanceType
+		ret = *instanceType
+	} else if machine != "" {
+		ret = machine
 	} else {
-		machine = defaultGCEMachine
+		ret = defaultGCEMachine
 	}
-	return fmt.Sprintf("zones/%s/machineTypes/%s", *zone, machine)
+	return fmt.Sprintf("zones/%s/machineTypes/%s", *zone, ret)
 }
 func (g *GCERunner) rebootInstance(instance *compute.Instance) error {
 	// wait until the instance will not response to SSH