Thread .kubernetes.listenPort through to install functions

Signed-off-by: Devon Stewart <[email protected]>

Author: blast-hardcheese

cmd/start.go

@@ -234,6 +234,7 @@ func init() {
 	startCmd.Flags().StringVar(&startCmdArgs.Kubernetes.Version, "kubernetes-version", defaultKubernetesVersion, "must match a k3s version https://github.com/k3s-io/k3s/releases")
 	startCmd.Flags().StringSliceVar(&startCmdArgs.Flags.LegacyKubernetesDisable, "kubernetes-disable", nil, "components to disable for k3s e.g. traefik,servicelb")
 	startCmd.Flags().StringSliceVar(&startCmdArgs.Kubernetes.K3sArgs, "k3s-arg", defaultK3sArgs, "additional args to pass to k3s")
+	startCmd.Flags().IntVar(&startCmdArgs.Kubernetes.Port, "k3s-listen-port", 0, "k3s server listen port")
 	startCmd.Flag("with-kubernetes").Hidden = true
 	startCmd.Flag("kubernetes-disable").Hidden = true
 
@@ -475,6 +476,9 @@ func prepareConfig(cmd *cobra.Command) {
 	if !cmd.Flag("k3s-arg").Changed && current.Kubernetes.K3sArgs != nil {
 		startCmdArgs.Kubernetes.K3sArgs = current.Kubernetes.K3sArgs
 	}
+	if !cmd.Flag("k3s-listen-port").Changed && current.Kubernetes.Port > 0 {
+		startCmdArgs.Kubernetes.Port = current.Kubernetes.Port
+	}
 	if !cmd.Flag("runtime").Changed {
 		startCmdArgs.Runtime = current.Runtime
 	}

config/config.go

@@ -76,6 +76,7 @@ type Kubernetes struct {
 	Enabled bool     `yaml:"enabled"`
 	Version string   `yaml:"version"`
 	K3sArgs []string `yaml:"k3sArgs"`
+	Port    int      `yaml:"port,omitempty"`
 }
 
 // Network is VM network configuration

embedded/defaults/colima.yaml

@@ -44,6 +44,11 @@ kubernetes:
   # Default: traefik is disabled
   k3sArgs: [--disable=traefik]
 
+  # Kubernetes port to listen on
+  # A common port is 6443, though left unbound to ensure no port conflicts
+  # Default: pick random unbound port
+  port: 0
+
 # Auto-activate on the Host for client access.
 # Setting to true does the following on startup
 #  - sets as active Docker context (for Docker runtime).

environment/container/kubernetes/k3s.go

@@ -41,10 +41,11 @@ func installK3s(host environment.HostActions,
 	containerRuntime string,
 	k3sVersion string,
 	k3sArgs []string,
+	k3sListenPort int,
 ) {
 	installK3sBinary(host, guest, a, k3sVersion)
 	installK3sCache(host, guest, a, log, containerRuntime, k3sVersion)
-	installK3sCluster(host, guest, a, containerRuntime, k3sVersion, k3sArgs)
+	installK3sCluster(host, guest, a, containerRuntime, k3sVersion, k3sArgs, k3sListenPort)
 }
 
 func installK3sBinary(
@@ -141,6 +142,7 @@ func installK3sCluster(
 	containerRuntime string,
 	k3sVersion string,
 	k3sArgs []string,
+	k3sListenPort int,
 ) {
 	// install k3s last to ensure it is the last step
 	downloadPath := "/tmp/k3s-install.sh"
@@ -184,7 +186,7 @@ func installK3sCluster(
 	}
 
 	a.Add(func() error {
-		port, err := getPortNumber(guest)
+		port, err := getPortNumber(guest, k3sListenPort)
 		if err != nil {
 			return err
 		}
@@ -199,7 +201,7 @@ func installK3sCluster(
 
 // getPortNumber retrieves the previously set port number.
 // If missing, an available random port is set and return.
-func getPortNumber(guest environment.GuestActions) (int, error) {
+func getPortNumber(guest environment.GuestActions, k3sListenPort int) (int, error) {
 	// port previously set, reuse it
 	if port, err := strconv.Atoi(guest.Get(listenPortKey)); err == nil && port > 0 {
 		return port, nil
@@ -211,8 +213,15 @@ func getPortNumber(guest environment.GuestActions) (int, error) {
 		return 6443, nil
 	}
 
-	// new instance, assign random port
-	port := util.RandomAvailablePort()
+	var port int
+	if k3sListenPort > 0 {
+		// template configured port
+		port = k3sListenPort
+	} else {
+		// new instance, assign random port
+		port = util.RandomAvailablePort()
+	}
+
 	if err := guest.Set(listenPortKey, strconv.Itoa(port)); err != nil {
 		return 0, err
 	}

environment/container/kubernetes/kubernetes.go

@@ -117,7 +117,7 @@ func (c *kubernetesRuntime) Provision(ctx context.Context) error {
 			installK3sCache(c.host, c.guest, a, log, runtime, conf.Version)
 		}
 		// other settings may have changed e.g. ingress
-		installK3sCluster(c.host, c.guest, a, runtime, conf.Version, conf.K3sArgs)
+		installK3sCluster(c.host, c.guest, a, runtime, conf.Version, conf.K3sArgs, conf.Port)
 	} else {
 		if c.isInstalled() {
 			a.Stagef("version changed to %s, downloading and installing", conf.Version)
@@ -128,7 +128,7 @@ func (c *kubernetesRuntime) Provision(ctx context.Context) error {
 				a.Stage("installing")
 			}
 		}
-		installK3s(c.host, c.guest, a, log, runtime, conf.Version, conf.K3sArgs)
+		installK3s(c.host, c.guest, a, log, runtime, conf.Version, conf.K3sArgs, conf.Port)
 	}
 
 	// this needs to happen on each startup