test: Improve cluster deletion defaults

kubernetes · Jan 8, 2024 · 9bef6ef · 9bef6ef
1 parent f3c9c05
commit 9bef6ef
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/cmd/kops/delete_cluster.go b/cmd/kops/delete_cluster.go
@@ -51,8 +51,9 @@ type DeleteClusterOptions struct {
 }
 
 func (o *DeleteClusterOptions) InitDefaults() {
-	o.count = 42
+	o.count = 0
 	o.interval = 10 * time.Second
+	o.wait = 10 * time.Minute
 }
 
 var (

diff --git a/docs/cli/kops_delete_cluster.md b/docs/cli/kops_delete_cluster.md
diff --git a/tests/e2e/kubetest2-kops/deployer/down.go b/tests/e2e/kubetest2-kops/deployer/down.go
@@ -52,9 +52,16 @@ func (d *deployer) Down() error {
 		d.KopsBinaryPath, "delete", "cluster",
 		"--name", d.ClusterName,
 		"--yes",
-		"--count=0",
-		"--interval=60s",
-		"--wait=60m",
+	}
+	version, err := kops.GetVersion(d.KopsBinaryPath)
+	if err != nil {
+		return err
+	}
+	if version > "1.29" {
+		args = append(args,
+			"--interval=60s",
+			"--wait=60m",
+		)
 	}
 	klog.Info(strings.Join(args, " "))
 	cmd := exec.Command(args[0], args[1:]...)