Adds a command line flag to set k8s version (#239)

* adds a command line flag to set k8s version

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

* linting

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

* fixing the lint for real this time

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

Author: psschwei

internal/command/flags.go

@@ -21,6 +21,7 @@ import (
 )
 
 var name string
+var kubernetesVersion string
 
 func clusterNameOption(targetCmd *cobra.Command, flagDefault string) {
 	targetCmd.Flags().StringVarP(
@@ -31,3 +32,12 @@ func clusterNameOption(targetCmd *cobra.Command, flagDefault string) {
 		fmt.Sprintf("%s cluster name to be used by kn-quickstart", targetCmd.Name()),
 	)
 }
+
+func kubernetesVersionOption(targetCmd *cobra.Command, flagDefault string) {
+	targetCmd.Flags().StringVarP(
+		&kubernetesVersion,
+		"kubernetes-version",
+		"k",
+		flagDefault,
+		"kubernetes version to use (1.x.y)")
+}

internal/command/kind.go

@@ -28,11 +28,12 @@ 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)
+			return kind.SetUp(name, kubernetesVersion)
 		},
 	}
 	// Set kindCmd options
 	clusterNameOption(kindCmd, "knative")
+	kubernetesVersionOption(kindCmd, "")
 
 	return kindCmd
 }

internal/command/minikube.go

@@ -30,10 +30,11 @@ 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)
+			return minikube.SetUp(name, kubernetesVersion)
 		},
 	}
 	// Set minikubeCmd options
 	clusterNameOption(minikubeCmd, "knative")
+	kubernetesVersionOption(minikubeCmd, "")
 	return minikubeCmd
 }

pkg/kind/kind.go

@@ -31,9 +31,12 @@ var clusterName string
 var kindVersion = 0.11
 
 // SetUp creates a local Kind cluster and installs all the relevant Knative components
-func SetUp(name string) error {
+func SetUp(name, kVersion string) error {
 	start := time.Now()
 	clusterName = name
+	if kVersion != "" {
+		kubernetesVersion = "v" + kVersion
+	}
 
 	if err := createKindCluster(); err != nil {
 		return fmt.Errorf("creating cluster: %w", err)

pkg/minikube/minikube.go

@@ -29,12 +29,17 @@ import (
 
 var clusterName string
 var kubernetesVersion = "1.23.4"
+var clusterVersionOverride bool
 var minikubeVersion = 1.25
 
 // SetUp creates a local Minikube cluster and installs all the relevant Knative components
-func SetUp(name string) error {
+func SetUp(name, kVersion string) error {
 	start := time.Now()
 	clusterName = name
+	if kVersion != "" {
+		kubernetesVersion = kVersion
+		clusterVersionOverride = true
+	}
 
 	if err := createMinikubeCluster(); err != nil {
 		return fmt.Errorf("creating cluster: %w", err)
@@ -152,16 +157,19 @@ func checkForExistingCluster() error {
 // createNewCluster creates a new Minikube cluster
 func createNewCluster() error {
 	fmt.Println("☸ Creating Minikube cluster...")
-	fmt.Println("\nBy default, using the standard minikube driver for your system")
-	fmt.Println("If you wish to use a different driver, please configure minikube using")
-	fmt.Print("    minikube config set driver <your-driver>\n\n")
-
-	// If minikube config kubernetes-version exists, use that instead of our default
-	getMinikubeVersion := exec.Command("minikube", "config", "get", "kubernetes-version")
-	out, err := getMinikubeVersion.Output()
-	// if the command returns a config, then use that for the kubernetes version
-	if err == nil {
-		kubernetesVersion = strings.TrimRight(string(out), "\n")
+
+	if !clusterVersionOverride {
+		fmt.Println("\nUsing the standard minikube driver for your system")
+		fmt.Println("If you wish to use a different driver, please configure minikube using")
+		fmt.Print("    minikube config set driver <your-driver>\n\n")
+
+		// If minikube config kubernetes-version exists, use that instead of our default
+		getMinikubeVersion := exec.Command("minikube", "config", "get", "kubernetes-version")
+		out, err := getMinikubeVersion.Output()
+		// if the command returns a config, then use that for the kubernetes version
+		if err == nil {
+			kubernetesVersion = strings.TrimRight(string(out), "\n")
+		}
 	}
 
 	// create cluster and wait until ready