Bypass email prompt for upgrades if installed

cmd/vclusterctl/cmd/platform/start.go

@@ -3,6 +3,7 @@ package platform
 import (
 	"context"
 	"fmt"
+	"k8s.io/client-go/kubernetes"
 	"strings"
 	"time"
 
@@ -84,10 +85,6 @@ before running this command:
 }
 
 func (cmd *StartCmd) Run(ctx context.Context) error {
-	if err := cmd.ensureEmailWithDisclaimer(); err != nil {
-		return err
-	}
-
 	// get version to deploy
 	if cmd.Version == "latest" || cmd.Version == "" {
 		cmd.Version = platform.MinimumVersionTag
@@ -150,10 +147,30 @@ func (cmd *StartCmd) Run(ctx context.Context) error {
 		}
 	}
 
+	if err := cmd.StartOptions.Prepare(false); err != nil {
+		return err
+	}
+
+	if err := cmd.ensureEmailWithDisclaimer(ctx, cmd.KubeClient, cmd.Namespace); err != nil {
+		return err
+	}
+
 	return start.NewLoftStarter(cmd.StartOptions).Start(ctx)
 }
 
-func (cmd *StartCmd) ensureEmailWithDisclaimer() error {
+func (cmd *StartCmd) ensureEmailWithDisclaimer(ctx context.Context, kc kubernetes.Interface, namespace string) error {
+	if cmd.Upgrade {
+		isInstalled, err := clihelper.IsLoftAlreadyInstalled(ctx, kc, namespace)
+
+		if err != nil {
+			return err
+		}
+
+		if isInstalled {
+			return nil
+		}
+	}
+
 	fmt.Printf(`By providing your email, you accept our Terms of Service and Privacy Statement:
 Terms of Service: https://www.loft.sh/legal/terms
 Privacy Statement: https://www.loft.sh/legal/privacy

pkg/cli/start/start.go

@@ -93,15 +93,11 @@ func (l *LoftStarter) Start(ctx context.Context) error {
 		l.LocalPort = "9898"
 	}
 
-	err := l.Prepare(false)
-	if err != nil {
-		return err
-	}
 	l.Log.WriteString(logrus.InfoLevel, "\n")
 
 	// Uninstall already existing Loft instance
 	if l.Reset {
-		err = clihelper.UninstallLoft(ctx, l.KubeClient, l.RestConfig, l.Context, l.Namespace, l.Log)
+		err := clihelper.UninstallLoft(ctx, l.KubeClient, l.RestConfig, l.Context, l.Namespace, l.Log)
 		if err != nil {
 			return err
 		}