fix: vcluster version command (#3752) (#3755)

(cherry picked from commit ca14769)

Signed-off-by: Marcin Franczyk <marcin0franczyk@gmail.com>
Co-authored-by: Marcin Franczyk <marcin0franczyk@gmail.com>

Author: loft-bot

cmd/vcluster/cmd/root.go

@@ -10,7 +10,6 @@ import (
 	"github.com/loft-sh/vcluster/cmd/vcluster/cmd/debug"
 	"github.com/loft-sh/vcluster/cmd/vcluster/cmd/node"
 	"github.com/loft-sh/vcluster/cmd/vcluster/cmd/snapshot"
-	"github.com/loft-sh/vcluster/pkg/telemetry"
 	"github.com/loft-sh/vcluster/pkg/util/osutil"
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
@@ -65,11 +64,9 @@ func RunRoot() {
 func BuildRoot() *cobra.Command {
 	rootCmd := NewRootCmd()
 
-	// Set version for --version flag
-	rootCmd.Version = telemetry.SyncerVersion
-
 	// add top level commands
 	rootCmd.AddCommand(NewStartCommand())
+	rootCmd.AddCommand(NewVersionCommand())
 	rootCmd.AddCommand(snapshot.NewSnapshotCommand())
 	rootCmd.AddCommand(snapshot.NewRestoreCommand())
 	rootCmd.AddCommand(NewPortForwardCommand())

cmd/vcluster/cmd/snapshot/restore.go

@@ -15,7 +15,7 @@ var (
 func NewRestoreCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "restore",
-		Short: "restore a vCluster",
+		Short: "Restore a vCluster",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			envOptions, err := snapshot.ParseOptionsFromEnv()

cmd/vcluster/cmd/snapshot/snapshot.go

@@ -10,7 +10,7 @@ import (
 func NewSnapshotCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "snapshot",
-		Short: "snapshot a vCluster",
+		Short: "Manage vCluster snapshots",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			client := &snapshot.Client{}

cmd/vcluster/cmd/start.go

@@ -36,7 +36,7 @@ func NewStartCommand() *cobra.Command {
 	startOptions := &StartOptions{}
 	cmd := &cobra.Command{
 		Use:   "start",
-		Short: "Execute the vcluster",
+		Short: "Start a vCluster",
 		Args:  cobra.NoArgs,
 		RunE: func(cobraCmd *cobra.Command, _ []string) (err error) {
 			// execute command

cmd/vcluster/cmd/version.go

@@ -0,0 +1,20 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/loft-sh/vcluster/pkg/telemetry"
+
+	"github.com/spf13/cobra"
+)
+
+func NewVersionCommand() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Print the vCluster version",
+		Args:  cobra.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Fprintln(cmd.OutOrStdout(), telemetry.SyncerVersion)
+		},
+	}
+}

cmd/vclusterctl/cmd/version.go

@@ -6,8 +6,7 @@ import (
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Print the version number of vcluster",
-	Long:  `All software has versions. This is Vcluster's.`,
+	Short: "Print the vCluster version",
 	Run: func(cmd *cobra.Command, _ []string) {
 		root := cmd.Root()
 		root.SetArgs([]string{"--version"})