Merge pull request #1409 from trawler/cfg_bootstrap_init

cmd/airgap/listimages.go

@@ -33,11 +33,7 @@ func NewAirgapListImagesCmd() *cobra.Command {
 		Example: `k0s airgap list-images`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c := CmdOpts(config.GetCmdOpts())
-			cfg, err := config.GetYamlFromFile(c.CfgFile, c.K0sVars)
-			if err != nil {
-				return err
-			}
-			uris := airgap.GetImageURIs(cfg.Spec.Images)
+			uris := airgap.GetImageURIs(c.ClusterConfig.Spec.Images)
 			for _, uri := range uris {
 				fmt.Println(uri)
 			}

cmd/api/api.go

@@ -63,16 +63,10 @@ func NewAPICmd() *cobra.Command {
 			logrus.SetOutput(os.Stdout)
 
 			c := CmdOpts(config.GetCmdOpts())
-			cfg, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-			if err != nil {
-				return err
-			}
-			c.NodeConfig = cfg
 			return c.startAPI()
 		},
 	}
 	cmd.SilenceUsage = true
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
 	return cmd
 }

cmd/backup/backup.go

@@ -43,21 +43,18 @@ func NewBackupCmd() *cobra.Command {
 		Short: "Back-Up k0s configuration. Must be run as root (or with sudo)",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c := CmdOpts(config.GetCmdOpts())
-			cfg, err := config.GetYamlFromFile(c.CfgFile, c.K0sVars)
-			if err != nil {
-				return err
-			}
-			c.ClusterConfig = cfg
-			if c.ClusterConfig.Spec.Storage.Etcd.IsExternalClusterUsed() {
+			if c.NodeConfig.Spec.Storage.Etcd.IsExternalClusterUsed() {
 				return fmt.Errorf("command 'k0s backup' does not support external etcd cluster")
 			}
 			return c.backup()
 		},
-		PreRunE: preRunValidateConfig,
+		PreRunE: func(c *cobra.Command, args []string) error {
+			cmdOpts := CmdOpts(config.GetCmdOpts())
+			return config.PreRunValidateConfig(cmdOpts.K0sVars)
+		},
 	}
 	cmd.Flags().StringVar(&savePath, "save-path", "", "destination directory path for backup assets, use '-' for stdout")
 	cmd.SilenceUsage = true
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
 	return cmd
 }
@@ -86,16 +83,7 @@ func (c *CmdOpts) backup() error {
 		if err != nil {
 			return err
 		}
-		return mgr.RunBackup(c.CfgFile, c.ClusterConfig.Spec, c.K0sVars, savePath)
+		return mgr.RunBackup(c.NodeConfig.Spec, c.K0sVars, savePath)
 	}
 	return fmt.Errorf("backup command must be run on the controller node, have `%s`", status.Role)
 }
-
-func preRunValidateConfig(cmd *cobra.Command, args []string) error {
-	c := CmdOpts(config.GetCmdOpts())
-	_, err := config.GetConfigFromYAML(c.CfgFile, c.K0sVars)
-	if err != nil {
-		return err
-	}
-	return nil
-}

cmd/config/validate.go

@@ -28,7 +28,9 @@ func NewValidateCmd() *cobra.Command {
    k0s config validate --config path_to_config.yaml`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c := CmdOpts(config.GetCmdOpts())
-			_, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
+
+			loadingRules := config.ClientConfigLoadingRules{K0sVars: c.K0sVars}
+			_, err := loadingRules.ParseRuntimeConfig()
 			return err
 		},
 		SilenceUsage:  true,

cmd/controller/certificates.go

@@ -136,11 +136,7 @@ func (c *Certificates) Init(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		if err := kubeConfig(c.K0sVars.KonnectivityKubeConfigPath, kubeConfigAPIUrl, c.CACert, konnectivityCert.Cert, konnectivityCert.Key, constant.KonnectivityServerUser); err != nil {
-			return err
-		}
-
-		return nil
+		return kubeConfig(c.K0sVars.KonnectivityKubeConfigPath, kubeConfigAPIUrl, c.CACert, konnectivityCert.Cert, konnectivityCert.Key, constant.KonnectivityServerUser)
 	})
 
 	eg.Go(func() error {

cmd/controller/controller.go

@@ -91,10 +91,6 @@ func NewControllerCmd() *cobra.Command {
 				}
 				c.TokenArg = string(bytes)
 			}
-			if c.SingleNode {
-				c.EnableWorker = true
-				c.K0sVars.DefaultStorageType = "kine"
-			}
 			c.Logging = stringmap.Merge(c.CmdLogLevels, c.DefaultLogLevels)
 			cmd.SilenceUsage = true
 
@@ -124,15 +120,25 @@ func (c *CmdOpts) startController(ctx context.Context) error {
 	if err := dir.Init(c.K0sVars.CertRootDir, constant.CertRootDirMode); err != nil {
 		return err
 	}
+	// let's make sure run-dir exists
+	if err := dir.Init(c.K0sVars.RunDir, constant.RunDirMode); err != nil {
+		return fmt.Errorf("failed to initialize dir: %v", err)
+	}
 
-	nodeConfig, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-	if err != nil {
-		return err
+	// initialize runtime config
+	loadingRules := config.ClientConfigLoadingRules{Nodeconfig: true}
+	if err := loadingRules.InitRuntimeConfig(c.K0sVars); err != nil {
+		return fmt.Errorf("failed to initialize k0s runtime config: %s", err.Error())
 	}
-	c.NodeConfig = nodeConfig
+
+	// from now on, we only refer to the runtime config
+	c.CfgFile = loadingRules.RuntimeConfigPath
+
 	certificateManager := certificate.Manager{K0sVars: c.K0sVars}
 
 	var joinClient *token.JoinClient
+	var err error
+
 	if c.TokenArg != "" && c.needToJoin() {
 		joinClient, err = joinController(ctx, c.TokenArg, c.K0sVars.CertRootDir)
 		if err != nil {
@@ -282,8 +288,9 @@ func (c *CmdOpts) startController(ctx context.Context) error {
 		// Stop components
 		if stopErr := c.NodeComponents.Stop(); stopErr != nil {
 			logrus.Errorf("error while stopping node component %s", stopErr)
+		} else {
+			logrus.Info("all node components stopped")
 		}
-		logrus.Info("all node components stopped")
 	}()
 
 	// in-cluster component reconcilers
@@ -335,11 +342,7 @@ func (c *CmdOpts) startController(ctx context.Context) error {
 			return err
 		}
 	} else {
-		fullCfg, err := config.GetYamlFromFile(c.CfgFile, c.K0sVars)
-		if err != nil {
-			return err
-		}
-		cfgSource, err = clusterconfig.NewStaticSource(fullCfg)
+		cfgSource, err = clusterconfig.NewStaticSource(c.ClusterConfig)
 		if err != nil {
 			return err
 		}
@@ -402,7 +405,7 @@ func (c *CmdOpts) startController(ctx context.Context) error {
 	logrus.Info("Shutting down k0s controller")
 
 	perfTimer.Output()
-	return err
+	return os.Remove(c.CfgFile)
 }
 
 func (c *CmdOpts) startClusterComponents(ctx context.Context) error {
@@ -420,7 +423,7 @@ func (c *CmdOpts) startBootstrapReconcilers(ctx context.Context, cf kubernetes.C
 			return err
 		}
 
-		cfgReconciler, err := controller.NewClusterConfigReconciler(c.CfgFile, leaderElector, c.K0sVars, c.ClusterComponents, manifestSaver, cf, configSource)
+		cfgReconciler, err := controller.NewClusterConfigReconciler(leaderElector, c.K0sVars, c.ClusterComponents, manifestSaver, cf, configSource)
 		if err != nil {
 			logrus.Warnf("failed to initialize cluster-config reconciler: %s", err.Error())
 			return err
@@ -472,7 +475,7 @@ func (c *CmdOpts) createClusterReconcilers(ctx context.Context, cf kubernetes.Cl
 	}
 
 	if !stringslice.Contains(c.DisableComponents, constant.KubeProxyComponentName) {
-		proxy, err := controller.NewKubeProxy(c.CfgFile, c.K0sVars)
+		proxy, err := controller.NewKubeProxy(c.CfgFile, c.K0sVars, c.NodeConfig)
 		if err != nil {
 			return fmt.Errorf("failed to initialize kube-proxy reconciler: %s", err.Error())
 

cmd/etcd/etcd.go

@@ -32,11 +32,6 @@ func NewEtcdCmd() *cobra.Command {
 		Short: "Manage etcd cluster",
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			c := CmdOpts(config.GetCmdOpts())
-			cfg, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-			if err != nil {
-				return err
-			}
-			c.ClusterConfig = cfg
 			if c.ClusterConfig.Spec.Storage.Type != v1beta1.EtcdStorageType {
 				return fmt.Errorf("wrong storage type: %s", c.ClusterConfig.Spec.Storage.Type)
 			}
@@ -49,7 +44,6 @@ func NewEtcdCmd() *cobra.Command {
 	cmd.SilenceUsage = true
 	cmd.AddCommand(etcdLeaveCmd())
 	cmd.AddCommand(etcdListCmd())
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
 	return cmd
 }

cmd/etcd/leave.go

@@ -33,22 +33,16 @@ func etcdLeaveCmd() *cobra.Command {
 		Short: "Sign off a given etc node from etcd cluster",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c := CmdOpts(config.GetCmdOpts())
-			cfg, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-			if err != nil {
-				return err
-			}
-			c.ClusterConfig = cfg
-
 			ctx := context.Background()
 			if etcdPeerAddress == "" {
-				etcdPeerAddress = c.ClusterConfig.Spec.Storage.Etcd.PeerAddress
+				etcdPeerAddress = c.NodeConfig.Spec.Storage.Etcd.PeerAddress
 			}
 			if etcdPeerAddress == "" {
 				return fmt.Errorf("can't leave etcd cluster: peer address is empty, check the config file or use cli argument")
 			}
 
 			peerURL := fmt.Sprintf("https://%s:2380", etcdPeerAddress)
-			etcdClient, err := etcd.NewClient(c.K0sVars.CertRootDir, c.K0sVars.EtcdCertDir, c.ClusterConfig.Spec.Storage.Etcd)
+			etcdClient, err := etcd.NewClient(c.K0sVars.CertRootDir, c.K0sVars.EtcdCertDir, c.NodeConfig.Spec.Storage.Etcd)
 			if err != nil {
 				return fmt.Errorf("can't connect to the etcd: %v", err)
 			}
@@ -76,6 +70,5 @@ func etcdLeaveCmd() *cobra.Command {
 
 	cmd.Flags().StringVar(&etcdPeerAddress, "peer-address", "", "etcd peer address")
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
 	return cmd
 }

cmd/etcd/list.go

@@ -33,14 +33,8 @@ func etcdListCmd() *cobra.Command {
 		Short: "Returns etcd cluster members list",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c := CmdOpts(config.GetCmdOpts())
-			cfg, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-			if err != nil {
-				return err
-			}
-			c.ClusterConfig = cfg
-
 			ctx := context.Background()
-			etcdClient, err := etcd.NewClient(c.K0sVars.CertRootDir, c.K0sVars.EtcdCertDir, c.ClusterConfig.Spec.Storage.Etcd)
+			etcdClient, err := etcd.NewClient(c.K0sVars.CertRootDir, c.K0sVars.EtcdCertDir, c.NodeConfig.Spec.Storage.Etcd)
 			if err != nil {
 				return fmt.Errorf("can't list etcd cluster members: %v", err)
 			}
@@ -51,7 +45,6 @@ func etcdListCmd() *cobra.Command {
 			return json.NewEncoder(os.Stdout).Encode(map[string]interface{}{"members": members})
 		},
 	}
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
 	return cmd
 }

cmd/install/controller.go

@@ -46,7 +46,10 @@ With the controller subcommand you can setup a single node cluster by running:
 			}
 			return nil
 		},
-		PreRunE: preRunValidateConfig,
+		PreRunE: func(c *cobra.Command, args []string) error {
+			cmdOpts := CmdOpts(config.GetCmdOpts())
+			return config.PreRunValidateConfig(cmdOpts.K0sVars)
+		},
 	}
 	// append flags
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())

cmd/install/install.go

@@ -50,12 +50,7 @@ func (c *CmdOpts) setup(role string, args []string) error {
 	}
 
 	if role == "controller" {
-		cfg, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-		if err != nil {
-			return err
-		}
-		c.ClusterConfig = cfg
-		if err := install.CreateControllerUsers(c.ClusterConfig, c.K0sVars); err != nil {
+		if err := install.CreateControllerUsers(c.NodeConfig, c.K0sVars); err != nil {
 			return fmt.Errorf("failed to create controller users: %v", err)
 		}
 	}
@@ -94,12 +89,3 @@ func (c *CmdOpts) convertFileParamsToAbsolute() (err error) {
 	}
 	return nil
 }
-
-func preRunValidateConfig(_ *cobra.Command, _ []string) error {
-	c := CmdOpts(config.GetCmdOpts())
-	_, err := config.GetConfigFromYAML(c.CfgFile, c.K0sVars)
-	if err != nil {
-		return err
-	}
-	return nil
-}

cmd/install/worker.go

@@ -45,7 +45,6 @@ Windows flags like "--api-server", "--cidr-range" and "--cluster-dns" will be ig
 
 			return nil
 		},
-		PreRunE: preRunValidateConfig,
 	}
 	// append flags
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())

cmd/kubeconfig/admin.go

@@ -42,10 +42,7 @@ func kubeConfigAdminCmd() *cobra.Command {
 					log.Fatal(err)
 				}
 
-				clusterAPIURL, err := c.getAPIURL()
-				if err != nil {
-					return fmt.Errorf("failed to fetch cluster's API Address: %w", err)
-				}
+				clusterAPIURL := c.NodeConfig.Spec.API.APIAddressURL()
 				newContent := strings.Replace(string(content), "https://localhost:6443", clusterAPIURL, -1)
 				os.Stdout.Write([]byte(newContent))
 			} else {

cmd/kubeconfig/create.go

@@ -24,7 +24,6 @@ import (
 	"path"
 
 	"github.com/cloudflare/cfssl/log"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/k0sproject/k0s/pkg/certificate"
@@ -78,10 +77,8 @@ Note: A certificate once signed cannot be revoked for a particular user`,
 			}
 			username := args[0]
 			c := CmdOpts(config.GetCmdOpts())
-			clusterAPIURL, err := c.getAPIURL()
-			if err != nil {
-				return fmt.Errorf("failed to fetch cluster's API Address: %w", err)
-			}
+			clusterAPIURL := c.NodeConfig.Spec.API.APIAddressURL()
+
 			caCert, err := os.ReadFile(path.Join(c.K0sVars.CertRootDir, "ca.crt"))
 			if err != nil {
 				return fmt.Errorf("failed to read cluster ca certificate: %w, check if the control plane is initialized on this node", err)
@@ -130,17 +127,6 @@ Note: A certificate once signed cannot be revoked for a particular user`,
 		},
 	}
 	cmd.Flags().StringVar(&groups, "groups", "", "Specify groups")
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
 	return cmd
 }
-
-func (c *CmdOpts) getAPIURL() (string, error) {
-	// Disable logrus
-	logrus.SetLevel(logrus.WarnLevel)
-	cfg, err := config.GetNodeConfig(c.CfgFile, c.K0sVars)
-	if err != nil {
-		return "", err
-	}
-	return cfg.Spec.API.APIAddressURL(), nil
-}