feat: provide config option for yurtadm

Signed-off-by: Liang Deng <283304489@qq.com>
openyurtio · Jun 16, 2023 · da58b33 · da58b33
1 parent 5fa5adb
commit da58b33
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/pkg/yurtadm/cmd/join/join.go b/pkg/yurtadm/cmd/join/join.go
@@ -40,6 +40,7 @@ import (
 )
 
 type joinOptions struct {
+	cfgPath                  string
 	token                    string
 	nodeType                 string
 	nodeName                 string
@@ -109,6 +110,9 @@ func NewCmdJoin(in io.Reader, out io.Writer, outErr io.Writer) *cobra.Command {
 
 // addJoinConfigFlags adds join flags bound to the config to the specified flagset
 func addJoinConfigFlags(flagSet *flag.FlagSet, joinOptions *joinOptions) {
+	flagSet.StringVar(
+		&joinOptions.cfgPath, yurtconstants.CfgPath, "", "Path to a joinConfiguration file.",
+	)
 	flagSet.StringVar(
 		&joinOptions.token, yurtconstants.TokenStr, "",
 		"Use this token for both discovery-token and tls-bootstrap-token when those values are not provided.",
@@ -200,6 +204,7 @@ func (nodeJoiner *nodeJoiner) Run() error {
 }
 
 type joinData struct {
+	cfgPath                  string
 	joinNodeData             *joindata.NodeRegistration
 	apiServerEndpoint        string
 	token                    string
@@ -264,6 +269,7 @@ func newJoinData(args []string, opt *joinOptions) (*joinData, error) {
 	}
 
 	data := &joinData{
+		cfgPath:               opt.cfgPath,
 		apiServerEndpoint:     apiServerEndpoint,
 		token:                 opt.token,
 		tlsBootstrapCfg:       nil,
@@ -341,6 +347,11 @@ func newJoinData(args []string, opt *joinOptions) (*joinData, error) {
 	return data, nil
 }
 
+// CfgPath returns path to a joinConfiguration file.
+func (j *joinData) CfgPath() string {
+	return j.cfgPath
+}
+
 // ServerAddr returns the public address of kube-apiserver.
 func (j *joinData) ServerAddr() string {
 	return j.apiServerEndpoint

diff --git a/pkg/yurtadm/cmd/join/joindata/data.go b/pkg/yurtadm/cmd/join/joindata/data.go
@@ -30,6 +30,7 @@ type NodeRegistration struct {
 }
 
 type YurtJoinData interface {
+	CfgPath() string
 	ServerAddr() string
 	JoinToken() string
 	PauseImage() string

diff --git a/pkg/yurtadm/cmd/join/phases/joinnode.go b/pkg/yurtadm/cmd/join/phases/joinnode.go
@@ -29,7 +29,12 @@ import (
 
 // RunJoinNode executes the node join process.
 func RunJoinNode(data joindata.YurtJoinData, out io.Writer, outErr io.Writer) error {
-	kubeadmJoinConfigFilePath := filepath.Join(constants.KubeletWorkdir, constants.KubeadmJoinConfigFileName)
+	var kubeadmJoinConfigFilePath string
+	if data.CfgPath() != "" {
+		kubeadmJoinConfigFilePath = data.CfgPath()
+	} else {
+		kubeadmJoinConfigFilePath = filepath.Join(constants.KubeletWorkdir, constants.KubeadmJoinConfigFileName)
+	}
 	kubeadmCmd := exec.Command("kubeadm", "join", fmt.Sprintf("--config=%s", kubeadmJoinConfigFilePath))
 	kubeadmCmd.Stdout = out
 	kubeadmCmd.Stderr = outErr

diff --git a/pkg/yurtadm/cmd/join/phases/prepare.go b/pkg/yurtadm/cmd/join/phases/prepare.go
@@ -76,8 +76,10 @@ func RunPrepare(data joindata.YurtJoinData) error {
 	if err := yurtadmutil.SetDiscoveryConfig(data); err != nil {
 		return err
 	}
-	if err := yurtadmutil.SetKubeadmJoinConfig(data); err != nil {
-		return err
+	if data.CfgPath() == "" {
+		if err := yurtadmutil.SetKubeadmJoinConfig(data); err != nil {
+			return err
+		}
 	}
 	return nil
 }
diff --git a/pkg/yurtadm/constants/constants.go b/pkg/yurtadm/constants/constants.go
@@ -90,7 +90,9 @@ const (
 	Organizations = "organizations"
 	// PauseImage flag sets the pause image for worker node.
 	PauseImage = "pause-image"
-	// TokenStr flags sets both the discovery-token and the tls-bootstrap-token when those values are not provided
+	// CfgPath flag sets the path to a JoinConfiguration file.
+	CfgPath = "config"
+	// TokenStr flag sets both the discovery-token and the tls-bootstrap-token when those values are not provided
 	TokenStr = "token"
 	// TokenDiscoveryCAHash flag instruct kubeadm to validate that the root CA public key matches this hash (for token-based discovery)
 	TokenDiscoveryCAHash = "discovery-token-ca-cert-hash"