fix: vcluster upgrade of k3s distro (#2857) (#2870)

(cherry picked from commit 194b36a)

Co-authored-by: Jose Silva <jaferson123@gmail.com>
Co-authored-by: José Silva <josesilva@Joses-MacBook-Pro.local>

Author: 3 people

pkg/cli/create_helm.go

@@ -228,6 +228,12 @@ func CreateHelm(ctx context.Context, options *CreateOptions, globalFlags *flags.
 			if err := currentVClusterConfig.UnmarshalYAMLStrict([]byte(migratedValues)); err != nil {
 				return err
 			}
+		} else {
+			// When a vCluster is not legacy, there should be a config secret and we will fetch the values from the secret
+			currentVClusterConfig, err = getConfigfileFromSecret(ctx, vClusterName, cmd.Namespace)
+			if err != nil {
+				return err
+			}
 		}
 
 		if len(cmd.Values) == 0 {
@@ -326,11 +332,6 @@ func CreateHelm(ctx context.Context, options *CreateOptions, globalFlags *flags.
 	verb := "created"
 	if isVClusterDeployed(release) {
 		verb = "upgraded"
-		currentVClusterConfig, err = getConfigfileFromSecret(ctx, vClusterName, cmd.Namespace, cmd.log)
-		if err != nil {
-			return err
-		}
-
 		// While certain backing store changes are allowed we prohibit changes to another distro.
 		if err := config.ValidateChanges(currentVClusterConfig, vClusterConfig); err != nil {
 			return err
@@ -935,7 +936,7 @@ func (cmd *createHelm) getVClusterConfigFromSnapshot(ctx context.Context) (strin
 	return "", nil
 }
 
-func getConfigfileFromSecret(ctx context.Context, name, namespace string, log log.Logger) (*config.Config, error) {
+func getConfigfileFromSecret(ctx context.Context, name, namespace string) (*config.Config, error) {
 	secretName := "vc-config-" + name
 
 	kConf := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(clientcmd.NewDefaultClientConfigLoadingRules(), &clientcmd.ConfigOverrides{})
@@ -951,10 +952,6 @@ func getConfigfileFromSecret(ctx context.Context, name, namespace string, log lo
 
 	secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, secretName, metav1.GetOptions{})
 	if err != nil {
-		if kerrors.IsNotFound(err) {
-			log.Warnf("Secret %s not found, returning empty vCluster config", secretName)
-			return &config.Config{}, nil
-		}
 		return nil, err
 	}