kubernetes
diff --git a/‎tests/e2e/kubetest2-kops/deployer/common.go‎
Lines changed: 9 additions & 0 deletions b/‎tests/e2e/kubetest2-kops/deployer/common.go‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎tests/e2e/kubetest2-kops/deployer/up.go‎
Lines changed: 26 additions & 0 deletions b/‎tests/e2e/kubetest2-kops/deployer/up.go‎
Lines changed: 26 additions & 0 deletions
@@ -51,6 +51,15 @@ func (d *deployer) initialize() error {
 		}
 	}
 
+	// TEMPORARY: drop any --zones flag from --create-args so that every
+	// kubetest2-kops invocation goes through the randomized zone selection
+	// (and its instance-type availability filtering). Revert once we have
+	// confirmed CI is healthy with the random-zone path.
+	if stripped := stripZonesFlag(d.CreateArgs); stripped != d.CreateArgs {
+		klog.Infof("dropping --zones flag from --create-args: %q -> %q", d.CreateArgs, stripped)
+		d.CreateArgs = stripped
+	}
+
 	var err error
 	d.zones, err = d.getZones()
 	if err != nil {
 
@@ -435,6 +435,32 @@ func extractZones(args string) []string {
 	return strings.Split(zonesValue, ",")
 }
 
+// stripZonesFlag removes any "--zones=..." or "--zones ..." tokens from a
+// space-separated argument string. TEMPORARY: paired with the
+// d.CreateArgs rewrite in initialize() to force every kubetest2-kops
+// invocation through the randomized zone selection.
+func stripZonesFlag(args string) string {
+	if args == "" {
+		return args
+	}
+	fields := strings.Fields(args)
+	out := make([]string, 0, len(fields))
+	for i := 0; i < len(fields); i++ {
+		f := fields[i]
+		if f == "--zones" {
+			if i+1 < len(fields) {
+				i++
+			}
+			continue
+		}
+		if strings.HasPrefix(f, "--zones=") {
+			continue
+		}
+		out = append(out, f)
+	}
+	return strings.Join(out, " ")
+}
+
 func (d *deployer) getZones() ([]string, error) {
 	if d.CreateArgs != "" {
 		zones := extractZones(d.CreateArgs)