Make kind local registry optional (#428)

* make kind registry optional

Signed-off-by: Paul S. Schweigert <[email protected]>

* Update internal/command/flags.go

Co-authored-by: David Simansky <[email protected]>

* add temporary warning about local registry

Signed-off-by: Paul S. Schweigert <[email protected]>

---------

Signed-off-by: Paul S. Schweigert <[email protected]>
Co-authored-by: David Simansky <[email protected]>

Author: psschwei

internal/command/flags.go

@@ -24,6 +24,7 @@ var name string
 var kubernetesVersion string
 var installServing bool
 var installEventing bool
+var installKindRegistry bool
 
 func clusterNameOption(targetCmd *cobra.Command, flagDefault string) {
 	targetCmd.Flags().StringVarP(
@@ -51,3 +52,7 @@ func installServingOption(targetCmd *cobra.Command) {
 func installEventingOption(targetCmd *cobra.Command) {
 	targetCmd.Flags().BoolVar(&installEventing, "install-eventing", false, "install Eventing on quickstart cluster")
 }
+
+func installKindRegistryOption(targetCmd *cobra.Command) {
+	targetCmd.Flags().BoolVar(&installKindRegistry, "registry", false, "install registry for Kind quickstart cluster")
+}

internal/command/kind.go

@@ -28,14 +28,15 @@ func NewKindCommand() *cobra.Command {
 		Short: "Quickstart with Kind",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			fmt.Println("Running Knative Quickstart using Kind")
-			return kind.SetUp(name, kubernetesVersion, installServing, installEventing)
+			return kind.SetUp(name, kubernetesVersion, installServing, installEventing, installKindRegistry)
 		},
 	}
 	// Set kindCmd options
 	clusterNameOption(kindCmd, "knative")
 	kubernetesVersionOption(kindCmd, "", "kubernetes version to use (1.x.y) or (kindest/node:v1.x.y)")
 	installServingOption(kindCmd)
 	installEventingOption(kindCmd)
+	installKindRegistryOption(kindCmd)
 
 	return kindCmd
 }

pkg/kind/kind.go

@@ -26,15 +26,15 @@ import (
 	"knative.dev/kn-plugin-quickstart/pkg/install"
 )
 
-var kubernetesVersion = "kindest/node:v1.25.3"
+var kubernetesVersion = "kindest/node:v1.26.6"
 var clusterName string
 var kindVersion = 0.16
 var container_reg_name = "kind-registry"
 var container_reg_port = "5001"
 var installKnative = true
 
 // SetUp creates a local Kind cluster and installs all the relevant Knative components
-func SetUp(name, kVersion string, installServing, installEventing bool) error {
+func SetUp(name, kVersion string, installServing, installEventing, installKindRegistry bool) error {
 	start := time.Now()
 
 	// if neither the "install-serving" or "install-eventing" flags are set,
@@ -60,7 +60,7 @@ func SetUp(name, kVersion string, installServing, installEventing bool) error {
 		}
 	}
 
-	if err := createKindCluster(); err != nil {
+	if err := createKindCluster(installKindRegistry); err != nil {
 		return fmt.Errorf("creating cluster: %w", err)
 	}
 	if installKnative {
@@ -88,18 +88,27 @@ func SetUp(name, kVersion string, installServing, installEventing bool) error {
 	return nil
 }
 
-func createKindCluster() error {
+func createKindCluster(registry bool) error {
 
 	if err := checkDocker(); err != nil {
 		return fmt.Errorf("%w", err)
 	}
-	if err := createLocalRegistry(); err != nil {
-		return fmt.Errorf("%w", err)
-	}
 	fmt.Println("✅ Checking dependencies...")
 	if err := checkKindVersion(); err != nil {
 		return fmt.Errorf("kind version: %w", err)
 	}
+	if registry {
+		fmt.Println("💽 Installing local registry...")
+		if err := createLocalRegistry(); err != nil {
+			return fmt.Errorf("%w", err)
+		}
+	} else {
+		// 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.")
+	}
+
 	if err := checkForExistingCluster(); err != nil {
 		return fmt.Errorf("existing cluster: %w", err)
 	}
@@ -165,7 +174,7 @@ func checkKindVersion() error {
 	if err != nil {
 		return fmt.Errorf("kind version: %w", err)
 	}
-	fmt.Printf("    Kind version is: %s\n", string(out))
+	fmt.Printf("    Kind version is: %s", string(out))
 
 	userKindVersion, err := parseKindVersion(string(out))
 	if err != nil {
@@ -201,7 +210,7 @@ func checkForExistingCluster() error {
 	matches := r.Match(out)
 	if matches {
 		var resp string
-		fmt.Print("Knative Cluster kind-" + clusterName + " already installed.\nDelete and recreate [y/N]: ")
+		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 {