config refactoring: address review comments

This commit:
  - Removes the default value in cobra config flag
  - Adds a logic to set the default file under the config package

Signed-off-by: Karen Almog <[email protected]>

cmd/restore/restore.go

@@ -58,7 +58,7 @@ func NewRestoreCmd() *cobra.Command {
 
 	cwd, err := os.Getwd()
 	if err != nil {
-		return nil
+		logrus.Fatal("failed to get local path")
 	}
 
 	restoredConfigPathDescription := fmt.Sprintf("Specify desired name and full path for the restored k0s.yaml file (default: %s/k0s_<archive timestamp>.yaml", cwd)

inttest/common/footloosesuite.go

@@ -564,7 +564,6 @@ func (s *FootlooseSuite) GetKubeClientConfig(node string, k0sKubeconfigArgs ...s
 	kubeConfigCmd := fmt.Sprintf("%s kubeconfig admin %s 2>/dev/null", s.K0sFullPath, strings.Join(k0sKubeconfigArgs, " "))
 	kubeConf, err := ssh.ExecWithOutput(kubeConfigCmd)
 	if err != nil {
-		fmt.Println(string(kubeConf))
 		return nil, err
 	}
 	cfg, err := clientcmd.Load([]byte(kubeConf))

pkg/config/cli.go

@@ -16,6 +16,7 @@ limitations under the License.
 package config
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -189,7 +190,8 @@ func GetControllerFlags() *pflag.FlagSet {
 // it in multiple places
 func FileInputFlag() *pflag.FlagSet {
 	flagset := &pflag.FlagSet{}
-	flagset.StringVarP(&CfgFile, "config", "c", constant.K0sConfigPathDefault, "config file, use '-' to read the config from stdin")
+	descString := fmt.Sprintf("config file, use '-' to read the config from stdin (default \"%s\")", constant.K0sConfigPathDefault)
+	flagset.StringVarP(&CfgFile, "config", "c", "", descString)
 
 	return flagset
 }
@@ -202,8 +204,8 @@ func GetCmdOpts() CLIOptions {
 		K0sVars.DefaultStorageType = "kine"
 	}
 
-	// when a custom config file is used, verify that it can be opened
-	if CfgFile != constant.K0sConfigPathDefault {
+	// When CfgFile is set, verify the file can be opened
+	if CfgFile != "" {
 		_, err := os.Open(CfgFile)
 		if err != nil {
 			logrus.Fatalf("failed to load config file (%s): %v", CfgFile, err)

pkg/config/file_config.go

@@ -83,12 +83,25 @@ func (rules *ClientConfigLoadingRules) ParseRuntimeConfig() (*v1beta1.ClusterCon
 	// stdin input
 	case "-":
 		return v1beta1.ConfigFromReader(os.Stdin, storage)
-	default:
-		f, err := os.Open(CfgFile)
+	case "":
+		// if no config is set, look for config in the default location
+		// if it does not exist there either, generate default config
+		f, err := os.Open(constant.K0sConfigPathDefault)
 		if err != nil {
 			if os.IsNotExist(err) {
 				return rules.generateDefaults(storage), nil
 			}
+		}
+		defer f.Close()
+
+		cfg, err = v1beta1.ConfigFromReader(f, storage)
+		if err != nil {
+			return nil, err
+		}
+
+	default:
+		f, err := os.Open(CfgFile)
+		if err != nil {
 			return nil, err
 		}
 		defer f.Close()