Merge pull request #2132 from FabianKramm/main

Fix: reset password namespace & start chart name

cmd/vclusterctl/cmd/platform/reset.go

@@ -78,6 +78,7 @@ vcluster platform reset password --user admin
 	c.Flags().StringVar(&cmd.Password, "password", "", "The new password to use")
 	c.Flags().BoolVar(&cmd.Create, "create", false, "Creates the user if it does not exist")
 	c.Flags().BoolVar(&cmd.Force, "force", false, "If user had no password will create one")
+	c.Flags().StringVar(&cmd.Namespace, "namespace", "vcluster-platform", "The namespace to use")
 
 	return c
 }
@@ -117,7 +118,7 @@ func (cmd *PasswordCmd) Run() error {
 				},
 				PasswordRef: &storagev1.SecretRef{
 					SecretName:      "loft-password-" + random.String(5),
-					SecretNamespace: "loft",
+					SecretNamespace: cmd.Namespace,
 					Key:             "password",
 				},
 			},
@@ -138,7 +139,7 @@ func (cmd *PasswordCmd) Run() error {
 
 		user.Spec.PasswordRef = &storagev1.SecretRef{
 			SecretName:      "loft-password-" + random.String(5),
-			SecretNamespace: "loft",
+			SecretNamespace: cmd.Namespace,
 			Key:             "password",
 		}
 		user, err = managementClient.Loft().StorageV1().Users().Update(context.Background(), user, metav1.UpdateOptions{})

cmd/vclusterctl/cmd/platform/start.go

@@ -3,7 +3,9 @@ package platform
 import (
 	"context"
 	"fmt"
+	"strings"
 
+	"github.com/blang/semver"
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/log/survey"
 	"github.com/loft-sh/log/terminal"
@@ -83,6 +85,15 @@ func (cmd *StartCmd) Run(ctx context.Context) error {
 			cmd.Version = latestVersion
 		}
 	}
+
+	// if < v4.0.0 then use ChartName loft
+	parsedVersion, err := semver.Parse(strings.TrimPrefix(cmd.Version, "v"))
+	if err != nil {
+		return fmt.Errorf("parse provided version %s: %w", cmd.Version, err)
+	} else if parsedVersion.LT(semver.MustParse("4.0.0-alpha.0")) && cmd.ChartName == "vcluster-platform" {
+		cmd.ChartName = "loft"
+	}
+
 	// make sure we are in the correct context
 	// first load the kube config
 	kubeClientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(clientcmd.NewDefaultClientConfigLoadingRules(), &clientcmd.ConfigOverrides{