feat: talosctl: allow v-prefixed k8s versions

Accept both `1.19.2` and `v1.19.2` formats for kubernetes versions in `talosctl gen`. Fixes #3155 Signed-off-by: Seán C McCord <ulexus@gmail.com>
siderolabs · Feb 26, 2021 · 61cb2fb · 61cb2fb
1 parent c7ee239
commit 61cb2fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/talosctl/cmd/mgmt/cluster/create.go b/cmd/talosctl/cmd/mgmt/cluster/create.go
@@ -405,7 +405,7 @@ func create(ctx context.Context) (err error) {
 				&bundle.InputOptions{
 					ClusterName: clusterName,
 					Endpoint:    fmt.Sprintf("https://%s:%d", defaultInternalLB, constants.DefaultControlPlanePort),
-					KubeVersion: kubernetesVersion,
+					KubeVersion: strings.TrimPrefix(kubernetesVersion, "v"),
 					GenOptions:  genOptions,
 				}),
 		)

diff --git a/cmd/talosctl/cmd/mgmt/config.go b/cmd/talosctl/cmd/mgmt/config.go
@@ -145,7 +145,7 @@ func genV1Alpha1Config(args []string) error {
 			&bundle.InputOptions{
 				ClusterName: args[0],
 				Endpoint:    args[1],
-				KubeVersion: kubernetesVersion,
+				KubeVersion: strings.TrimPrefix(kubernetesVersion, "v"),
 				GenOptions: append(genOptions,
 					generate.WithInstallDisk(installDisk),
 					generate.WithInstallImage(installImage),