cleanup test clusters (#331)

* cleanup test clusters

* better logging for cluster removal

* simplify logic

Author: laverya

dagger/e2e.go

@@ -47,10 +47,28 @@ func e2e(
 		Status string `json:"status"`
 	}
 	replicatedCluster := ReplicatedCluster{}
-	if err := json.Unmarshal([]byte(out), &replicatedCluster); err != nil {
+	err = json.Unmarshal([]byte(out), &replicatedCluster)
+	if err != nil {
 		return fmt.Errorf("failed to unmarshal cluster: %w", err)
 	}
 
+	// Defer cluster deletion if we got a cluster ID
+	if replicatedCluster.ID != "" {
+		defer func() {
+			fmt.Printf("Cleaning up cluster %s of distribution %s and version %s...\n", replicatedCluster.ID, distribution, version)
+			cleanupCtr := dag.Container().From("replicated/vendor-cli:latest").
+				WithSecretVariable("REPLICATED_API_TOKEN", replicatedServiceAccount).
+				WithExec([]string{"/replicated", "cluster", "rm", replicatedCluster.ID})
+
+			cleanupOut, cleanupErr := cleanupCtr.Stdout(ctx)
+			if cleanupErr != nil {
+				fmt.Printf("Warning: failed to delete cluster %s of distribution %s and version %s: %v\n", replicatedCluster.ID, distribution, version, cleanupErr)
+			} else {
+				fmt.Printf("Successfully deleted cluster %s of distribution %s and version %s: %s\n", replicatedCluster.ID, distribution, version, cleanupOut)
+			}
+		}()
+	}
+
 	// get the kubeconfig
 	ctr = dag.Container().From("replicated/vendor-cli:latest").
 		WithSecretVariable("REPLICATED_API_TOKEN", replicatedServiceAccount).
@@ -631,7 +649,7 @@ spec:
 	var allImagesSet map[string]struct{}
 	// Now we expect both the alpine/curl from default namespace AND busybox from kube-system
 	nowRequired := []string{
-		"docker.io/alpine/curl:latest",  // from replicated-ssl-test in default namespace
+		"docker.io/alpine/curl:latest",     // from replicated-ssl-test in default namespace
 		"docker.io/library/busybox:latest", // from kube-system namespace
 	}
 	maxAttempts := 5