make kind image configurable (#196)

Signed-off-by: Sven Pfennig <[email protected]>

Author: 0xE282B0

internal/command/flags.go

@@ -33,11 +33,11 @@ func clusterNameOption(targetCmd *cobra.Command, flagDefault string) {
 	)
 }
 
-func kubernetesVersionOption(targetCmd *cobra.Command, flagDefault string) {
+func kubernetesVersionOption(targetCmd *cobra.Command, flagDefault string, usageText string) {
 	targetCmd.Flags().StringVarP(
 		&kubernetesVersion,
 		"kubernetes-version",
 		"k",
 		flagDefault,
-		"kubernetes version to use (1.x.y)")
+		usageText)
 }

internal/command/kind.go

@@ -33,7 +33,7 @@ func NewKindCommand() *cobra.Command {
 	}
 	// Set kindCmd options
 	clusterNameOption(kindCmd, "knative")
-	kubernetesVersionOption(kindCmd, "")
+	kubernetesVersionOption(kindCmd, "", "kubernetes version to use (1.x.y) or (kindest/node:v1.x.y)")
 
 	return kindCmd
 }

internal/command/minikube.go

@@ -35,6 +35,6 @@ func NewMinikubeCommand() *cobra.Command {
 	}
 	// Set minikubeCmd options
 	clusterNameOption(minikubeCmd, "knative")
-	kubernetesVersionOption(minikubeCmd, "")
+	kubernetesVersionOption(minikubeCmd, "", "kubernetes version to use (1.x.y)")
 	return minikubeCmd
 }

pkg/kind/kind.go

@@ -26,7 +26,7 @@ import (
 	"knative.dev/kn-plugin-quickstart/pkg/install"
 )
 
-var kubernetesVersion = "v1.23.3"
+var kubernetesVersion = "kindest/node:v1.23.3"
 var clusterName string
 var kindVersion = 0.11
 
@@ -35,7 +35,11 @@ func SetUp(name, kVersion string) error {
 	start := time.Now()
 	clusterName = name
 	if kVersion != "" {
-		kubernetesVersion = "v" + kVersion
+		if strings.Contains(kVersion, ":") {
+			kubernetesVersion = kVersion
+		} else {
+			kubernetesVersion = "kindest/node:v" + kVersion
+		}
 	}
 
 	if err := createKindCluster(); err != nil {
@@ -163,7 +167,7 @@ apiVersion: kind.x-k8s.io/v1alpha4
 name: %s
 nodes:
 - role: control-plane
-  image: kindest/node:%s
+  image: %s
   extraPortMappings:
   - containerPort: 31080
     listenAddress: 127.0.0.1