From 65fe7a678f4bd6b7d095dccecf4c9ee0c9b30e0b Mon Sep 17 00:00:00 2001 From: Enrico Candino Date: Tue, 18 Feb 2025 16:04:11 +0100 Subject: [PATCH] fix k3s version metadata (#256) --- cli/cmds/cluster/create.go | 6 ++++++ cli/cmds/cluster/create_flags.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cli/cmds/cluster/create.go b/cli/cmds/cluster/create.go index 0c8edc55..ecebf4b1 100644 --- a/cli/cmds/cluster/create.go +++ b/cli/cmds/cluster/create.go @@ -89,6 +89,12 @@ func createAction(config *CreateConfig) cli.ActionFunc { return err } + if strings.Contains(config.version, "+") { + orig := config.version + config.version = strings.Replace(config.version, "+", "-", -1) + logrus.Warnf("Invalid K3s docker reference version: '%s'. Using '%s' instead", orig, config.version) + } + if config.token != "" { logrus.Infof("Creating cluster token secret") obj := k3kcluster.TokenSecretObj(config.token, name, cmds.Namespace()) diff --git a/cli/cmds/cluster/create_flags.go b/cli/cmds/cluster/create_flags.go index e7bbb012..657d2250 100644 --- a/cli/cmds/cluster/create_flags.go +++ b/cli/cmds/cluster/create_flags.go @@ -77,7 +77,7 @@ func NewCreateFlags(config *CreateConfig) []cli.Flag { }, &cli.StringFlag{ Name: "mode", - Usage: "k3k mode type", + Usage: "k3k mode type (shared, virtual)", Destination: &config.mode, Value: "shared", Action: func(ctx *cli.Context, value string) error {