Merge pull request #4288 from twz123/remove-converfileparams

Remove convertFileParamsToAbsolute

Author: twz123

cmd/install/controller.go

@@ -53,11 +53,12 @@ With the controller subcommand you can setup a single node cluster by running:
 				return fmt.Errorf("invalid node config: %w", errors.Join(errs...))
 			}
 
-			if err := c.convertFileParamsToAbsolute(); err != nil {
+			flagsAndVals, err := cmdFlagsToArgs(cmd)
+			if err != nil {
 				return err
 			}
-			flagsAndVals := []string{"controller"}
-			flagsAndVals = append(flagsAndVals, cmdFlagsToArgs(cmd)...)
+
+			flagsAndVals = append([]string{"controller"}, flagsAndVals...)
 			if err := c.setup("controller", flagsAndVals, installFlags); err != nil {
 				return err
 			}

cmd/install/install.go

@@ -19,9 +19,7 @@ package install
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 
-	"github.com/k0sproject/k0s/internal/pkg/file"
 	"github.com/k0sproject/k0s/pkg/config"
 	"github.com/k0sproject/k0s/pkg/install"
 
@@ -77,32 +75,3 @@ func (c *command) setup(role string, args []string, installFlags *installFlags)
 	}
 	return nil
 }
-
-// This command converts the file paths in the command struct to absolute paths.
-// For flags passed to service init file, see the [cmdFlagsToArgs] func.
-func (c *command) convertFileParamsToAbsolute() (err error) {
-	// don't convert if cfgFile is empty
-
-	if c.K0sVars.StartupConfigPath != "" {
-		c.K0sVars.StartupConfigPath, err = filepath.Abs(c.K0sVars.StartupConfigPath)
-		if err != nil {
-			return err
-		}
-	}
-	if c.K0sVars.DataDir != "" {
-		c.K0sVars.DataDir, err = filepath.Abs(c.K0sVars.DataDir)
-		if err != nil {
-			return err
-		}
-	}
-	if c.TokenFile != "" {
-		c.TokenFile, err = filepath.Abs(c.TokenFile)
-		if err != nil {
-			return err
-		}
-		if !file.Exists(c.TokenFile) {
-			return fmt.Errorf("%s does not exist", c.TokenFile)
-		}
-	}
-	return nil
-}

cmd/install/util.go

@@ -17,6 +17,7 @@ limitations under the License.
 package install
 
 import (
+	"errors"
 	"fmt"
 	"path/filepath"
 	"strings"
@@ -26,23 +27,34 @@ import (
 	"github.com/spf13/pflag"
 )
 
-func cmdFlagsToArgs(cmd *cobra.Command) []string {
+func cmdFlagsToArgs(cmd *cobra.Command) ([]string, error) {
 	var flagsAndVals []string
+	var errs []error
 	// Use visitor to collect all flags and vals into slice
 	cmd.Flags().Visit(func(f *pflag.Flag) {
 		val := f.Value.String()
 		switch f.Value.Type() {
 		case "stringSlice", "stringToString":
 			flagsAndVals = append(flagsAndVals, fmt.Sprintf(`--%s=%s`, f.Name, strings.Trim(val, "[]")))
 		default:
-			if f.Name == "env" || f.Name == "force" {
+			switch f.Name {
+			case "env", "force":
 				return
-			}
-			if f.Name == "data-dir" || f.Name == "token-file" || f.Name == "config" {
-				val, _ = filepath.Abs(val)
+			case "data-dir", "token-file", "config":
+				if absVal, err := filepath.Abs(val); err != nil {
+					err = fmt.Errorf("failed to convert --%s=%s to an absolute path: %w", f.Name, val, err)
+					errs = append(errs, err)
+				} else {
+					val = absVal
+				}
 			}
 			flagsAndVals = append(flagsAndVals, fmt.Sprintf("--%s=%s", f.Name, val))
 		}
 	})
-	return flagsAndVals
+
+	if err := errors.Join(errs...); err != nil {
+		return nil, err
+	}
+
+	return flagsAndVals, nil
 }

cmd/install/worker.go

@@ -36,12 +36,13 @@ Windows flags like "--api-server", "--cidr-range" and "--cluster-dns" will be ig
 				return err
 			}
 			c := (*command)(opts)
-			if err := c.convertFileParamsToAbsolute(); err != nil {
+
+			flagsAndVals, err := cmdFlagsToArgs(cmd)
+			if err != nil {
 				return err
 			}
 
-			flagsAndVals := []string{"worker"}
-			flagsAndVals = append(flagsAndVals, cmdFlagsToArgs(cmd)...)
+			flagsAndVals = append([]string{"worker"}, flagsAndVals...)
 			if err := c.setup("worker", flagsAndVals, installFlags); err != nil {
 				return err
 			}