fix: reset fails on worker nodes after an upgrade (#1356)

* fix: reset fails on worker nodes after an upgrade

* feedback

cmd/embedded-cluster/flags.go

@@ -58,7 +58,7 @@ func getLocalArtifactMirrorPortFlag(runtimeConfig *ecv1beta1.RuntimeConfigSpec)
 	}
 }
 
-func getDataDirFlag(runtimeConfig *ecv1beta1.RuntimeConfigSpec) cli.Flag {
+func getDataDirFlagWithDefault(runtimeConfig *ecv1beta1.RuntimeConfigSpec) *cli.StringFlag {
 	return &cli.StringFlag{
 		Name:   "data-dir",
 		Usage:  "Path to the data directory",
@@ -74,3 +74,19 @@ func getDataDirFlag(runtimeConfig *ecv1beta1.RuntimeConfigSpec) cli.Flag {
 		},
 	}
 }
+
+func getDataDirFlag(runtimeConfig *ecv1beta1.RuntimeConfigSpec) *cli.StringFlag {
+	return &cli.StringFlag{
+		Name:   "data-dir",
+		Usage:  "Path to the data directory (default discovered from the cluster)",
+		Hidden: false,
+		Action: func(c *cli.Context, s string) error {
+			if s == "" {
+				return nil
+			}
+			logrus.Debugf("Setting data dir to %s from flag", s)
+			runtimeConfig.DataDir = s
+			return nil
+		},
+	}
+}

cmd/embedded-cluster/install.go

@@ -660,7 +660,7 @@ func installCommand() *cli.Command {
 					Name:  "airgap-bundle",
 					Usage: "Path to the air gap bundle. If set, the installation will complete without internet access.",
 				},
-				getDataDirFlag(runtimeConfig),
+				getDataDirFlagWithDefault(runtimeConfig),
 				&cli.StringFlag{
 					Name:    "license",
 					Aliases: []string{"l"},

cmd/embedded-cluster/materialize.go

@@ -19,7 +19,7 @@ func materializeCommand() *cli.Command {
 		Usage:  "Materialize embedded assets into the data directory",
 		Hidden: true,
 		Flags: []cli.Flag{
-			getDataDirFlag(runtimeConfig),
+			getDataDirFlagWithDefault(runtimeConfig),
 		},
 		Before: func(c *cli.Context) error {
 			if os.Getuid() != 0 {

cmd/embedded-cluster/preflights.go

@@ -38,7 +38,7 @@ func installRunPreflightsCommand() *cli.Command {
 					Usage: "Disable interactive prompts.",
 					Value: false,
 				},
-				getDataDirFlag(runtimeConfig),
+				getDataDirFlagWithDefault(runtimeConfig),
 				getAdminConsolePortFlag(runtimeConfig),
 				getLocalArtifactMirrorPortFlag(runtimeConfig),
 			},

cmd/embedded-cluster/provider.go

@@ -38,17 +38,17 @@ func discoverKubeconfigPath(ctx context.Context, runtimeConfig *ecv1beta1.Runtim
 // discoverBestProvider discovers the provider from the cluster (if it's up) and will fall back to
 // the flag, the filesystem, or the default.
 func discoverBestProvider(ctx context.Context, runtimeConfig *ecv1beta1.RuntimeConfigSpec) *defaults.Provider {
+	// Use the data dir from the data-dir flag if it's set
+	if runtimeConfig.DataDir != "" {
+		return defaults.NewProviderFromRuntimeConfig(runtimeConfig)
+	}
+
 	// It's possible that the cluster is not up
 	provider, err := getProviderFromCluster(ctx)
 	if err == nil {
 		return provider
 	}
 
-	// Use the data dir from the data-dir flag if it's set
-	if runtimeConfig.DataDir != "" {
-		return defaults.NewProviderFromRuntimeConfig(runtimeConfig)
-	}
-
 	// Otherwise, fall back to the filesystem
 	provider, err = defaults.NewProviderFromFilesystem()
 	if err == nil {

cmd/embedded-cluster/restore.go

@@ -908,7 +908,7 @@ func restoreCommand() *cli.Command {
 					Name:  "airgap-bundle",
 					Usage: "Path to the air gap bundle. If set, the restore will complete without internet access.",
 				},
-				getDataDirFlag(runtimeConfig),
+				getDataDirFlagWithDefault(runtimeConfig),
 				&cli.StringFlag{
 					Name:  "local-artifact-mirror-port",
 					Usage: "Port on which the Local Artifact Mirror will be served. If left empty, the port will be retrieved from the snapshot.",