adds flags for installing knative a la carte (#279)

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

Adds command line flags `--install-serving` and `install-eventing` to
enable users to install only one Knative component (i.e. only serving).
Using both flags will install both components (which is also the default
behavior when no flag is passed).

Author: psschwei

internal/command/flags.go

@@ -22,6 +22,8 @@ import (
 
 var name string
 var kubernetesVersion string
+var installServing bool
+var installEventing bool
 
 func clusterNameOption(targetCmd *cobra.Command, flagDefault string) {
 	targetCmd.Flags().StringVarP(
@@ -41,3 +43,11 @@ func kubernetesVersionOption(targetCmd *cobra.Command, flagDefault string, usage
 		flagDefault,
 		usageText)
 }
+
+func installServingOption(targetCmd *cobra.Command) {
+	targetCmd.Flags().BoolVar(&installServing, "install-serving", false, "install Serving on quickstart cluster")
+}
+
+func installEventingOption(targetCmd *cobra.Command) {
+	targetCmd.Flags().BoolVar(&installEventing, "install-eventing", false, "install Eventing on quickstart cluster")
+}

internal/command/kind.go

@@ -28,12 +28,14 @@ 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)
+			return kind.SetUp(name, kubernetesVersion, installServing, installEventing)
 		},
 	}
 	// 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)
 
 	return kindCmd
 }

internal/command/minikube.go

@@ -30,11 +30,13 @@ func NewMinikubeCommand() *cobra.Command {
 		Short: "Quickstart with Minikube",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			fmt.Println("Running Knative Quickstart using Minikube")
-			return minikube.SetUp(name, kubernetesVersion)
+			return minikube.SetUp(name, kubernetesVersion, installServing, installEventing)
 		},
 	}
 	// Set minikubeCmd options
 	clusterNameOption(minikubeCmd, "knative")
 	kubernetesVersionOption(minikubeCmd, "", "kubernetes version to use (1.x.y)")
+	installServingOption(minikubeCmd)
+	installEventingOption(minikubeCmd)
 	return minikubeCmd
 }

pkg/kind/kind.go

@@ -31,9 +31,16 @@ var clusterName string
 var kindVersion = 0.11
 
 // SetUp creates a local Kind cluster and installs all the relevant Knative components
-func SetUp(name, kVersion string) error {
+func SetUp(name, kVersion string, installServing, installEventing bool) error {
 	start := time.Now()
 
+	// if neither the "install-serving" or "install-eventing" flags are set,
+	// then we assume the user wants to install both serving and eventing
+	if !installServing && !installEventing {
+		installServing = true
+		installEventing = true
+	}
+
 	// kubectl is required, fail if not found
 	if _, err := exec.LookPath("kubectl"); err != nil {
 		fmt.Println("ERROR: kubectl is required for quickstart")
@@ -53,18 +60,25 @@ func SetUp(name, kVersion string) error {
 	if err := createKindCluster(); err != nil {
 		return fmt.Errorf("creating cluster: %w", err)
 	}
-	if err := install.Serving(); err != nil {
-		return fmt.Errorf("install serving: %w", err)
-	}
-	if err := install.Kourier(); err != nil {
-		return fmt.Errorf("install kourier: %w", err)
-	}
-	if err := install.KourierKind(); err != nil {
-		return fmt.Errorf("configure kourier: %w", err)
+
+	if installServing {
+		if err := install.Serving(); err != nil {
+			return fmt.Errorf("install serving: %w", err)
+		}
+		if err := install.Kourier(); err != nil {
+			return fmt.Errorf("install kourier: %w", err)
+		}
+		if err := install.KourierKind(); err != nil {
+			return fmt.Errorf("configure kourier: %w", err)
+		}
 	}
-	if err := install.Eventing(); err != nil {
-		return fmt.Errorf("install eventing: %w", err)
+
+	if installEventing {
+		if err := install.Eventing(); err != nil {
+			return fmt.Errorf("install eventing: %w", err)
+		}
 	}
+
 	finish := time.Since(start).Round(time.Second)
 	fmt.Printf("🚀 Knative install took: %s \n", finish)
 	fmt.Println("🎉 Now have some fun with Serverless and Event Driven Apps!")

pkg/minikube/minikube.go

@@ -35,9 +35,16 @@ var cpus = "3"
 var memory = "3072"
 
 // SetUp creates a local Minikube cluster and installs all the relevant Knative components
-func SetUp(name, kVersion string) error {
+func SetUp(name, kVersion string, installServing, installEventing bool) error {
 	start := time.Now()
 
+	// if neither the "install-serving" or "install-eventing" flags are set,
+	// then we assume the user wants to install both serving and eventing
+	if !installServing && !installEventing {
+		installServing = true
+		installEventing = true
+	}
+
 	// kubectl is required, fail if not found
 	if _, err := exec.LookPath("kubectl"); err != nil {
 		fmt.Println("ERROR: kubectl is required for quickstart")
@@ -62,17 +69,23 @@ func SetUp(name, kVersion string) error {
 		fmt.Println("\nPress the Enter key to continue")
 		fmt.Scanln()
 	}
-	if err := install.Serving(); err != nil {
-		return fmt.Errorf("install serving: %w", err)
-	}
-	if err := install.Kourier(); err != nil {
-		return fmt.Errorf("install kourier: %w", err)
-	}
-	if err := install.KourierMinikube(); err != nil {
-		return fmt.Errorf("configure kourier: %w", err)
+
+	if installServing {
+		if err := install.Serving(); err != nil {
+			return fmt.Errorf("install serving: %w", err)
+		}
+		if err := install.Kourier(); err != nil {
+			return fmt.Errorf("install kourier: %w", err)
+		}
+		if err := install.KourierMinikube(); err != nil {
+			return fmt.Errorf("configure kourier: %w", err)
+		}
 	}
-	if err := install.Eventing(); err != nil {
-		return fmt.Errorf("install eventing: %w", err)
+
+	if installEventing {
+		if err := install.Eventing(); err != nil {
+			return fmt.Errorf("install eventing: %w", err)
+		}
 	}
 
 	finish := time.Since(start).Round(time.Second)