From 71de8a63413918eec3129895928154b07436f184 Mon Sep 17 00:00:00 2001
From: Paul Schweigert <paul@paulschweigert.com>
Date: Thu, 7 Mar 2024 18:53:48 -0500
Subject: [PATCH] kind install works without needing registry flag (#498)

Signed-off-by: Paul S. Schweigert <paul@paulschweigert.com>
---
 pkg/kind/kind.go | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkg/kind/kind.go b/pkg/kind/kind.go
index ceeba70c..e2faa97d 100644
--- a/pkg/kind/kind.go
+++ b/pkg/kind/kind.go
@@ -113,10 +113,10 @@ func createKindCluster(registry bool) error {
 		// temporary warning that registry creation is now opt-in
 		// remove in v1.12
 		fmt.Println("\nA local registry is no longer created by default.")
-		fmt.Println("    To create a local registry, use the --registry flag.")
+		fmt.Print("    To create a local registry, use the --registry flag.\n\n")
 	}
 
-	if err := checkForExistingCluster(); err != nil {
+	if err := checkForExistingCluster(registry); err != nil {
 		return fmt.Errorf("existing cluster: %w", err)
 	}
 
@@ -205,7 +205,7 @@ func checkKindVersion() error {
 // checkForExistingCluster checks if the user already has a Kind cluster. If so, it provides
 // the option of deleting the existing cluster and recreating it. If not, it proceeds to
 // creating a new cluster
-func checkForExistingCluster() error {
+func checkForExistingCluster(registry bool) error {
 
 	getClusters := exec.Command("kind", "get", "clusters", "-q")
 	out, err := getClusters.CombinedOutput()
@@ -220,7 +220,7 @@ func checkForExistingCluster() error {
 		fmt.Print("\nKnative Cluster kind-" + clusterName + " already installed.\nDelete and recreate [y/N]: ")
 		fmt.Scanf("%s", &resp)
 		if resp == "y" || resp == "Y" {
-			if err := recreateCluster(); err != nil {
+			if err := recreateCluster(registry); err != nil {
 				return fmt.Errorf("new cluster: %w", err)
 			}
 		} else {
@@ -236,7 +236,7 @@ func checkForExistingCluster() error {
 				fmt.Print("Knative installation already exists.\nDelete and recreate the cluster [y/N]: ")
 				fmt.Scanf("%s", &resp)
 				if resp == "y" || resp == "Y" {
-					if err := recreateCluster(); err != nil {
+					if err := recreateCluster(registry); err != nil {
 						return fmt.Errorf("new cluster: %w", err)
 					}
 				} else {
@@ -251,8 +251,13 @@ func checkForExistingCluster() error {
 		if err := createNewCluster(); err != nil {
 			return fmt.Errorf("new cluster: %w", err)
 		}
-		if err := connectLocalRegistry(); err != nil {
-			return fmt.Errorf("local-registry: %w", err)
+		if registry {
+			if err := createLocalRegistry(); err != nil {
+				return fmt.Errorf("%w", err)
+			}
+			if err := connectLocalRegistry(); err != nil {
+				return fmt.Errorf("local-registry: %w", err)
+			}
 		}
 	}
 
@@ -260,7 +265,7 @@ func checkForExistingCluster() error {
 }
 
 // recreateCluster recreates a Kind cluster
-func recreateCluster() error {
+func recreateCluster(registry bool) error {
 	fmt.Println("\n    Deleting cluster...")
 	deleteCluster := exec.Command("kind", "delete", "cluster", "--name", clusterName)
 	if err := deleteCluster.Run(); err != nil {
@@ -273,11 +278,13 @@ func recreateCluster() error {
 	if err := createNewCluster(); err != nil {
 		return fmt.Errorf("new cluster: %w", err)
 	}
-	if err := createLocalRegistry(); err != nil {
-		return fmt.Errorf("%w", err)
-	}
-	if err := connectLocalRegistry(); err != nil {
-		return fmt.Errorf("local-registry: %w", err)
+	if registry {
+		if err := createLocalRegistry(); err != nil {
+			return fmt.Errorf("%w", err)
+		}
+		if err := connectLocalRegistry(); err != nil {
+			return fmt.Errorf("local-registry: %w", err)
+		}
 	}
 	return nil
 }