Feature:Support specified kubeadm conf for join cluster

openyurtio · Jan 27, 2021 · ad81525 · ad81525
1 parent dafdb99
commit ad81525
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/pkg/yurtctl/cmd/convert/convert.go b/pkg/yurtctl/cmd/convert/convert.go
@@ -58,6 +58,7 @@ type ConvertOptions struct {
 	YurttunnelServerImage      string
 	YurttunnelAgentImage       string
 	PodMainfestPath            string
+	KubeadmConfPath            string
 	DeployTunnel               bool
 	kubeConfigPath             string
 }
@@ -101,6 +102,9 @@ func NewConvertCmd() *cobra.Command {
 	cmd.Flags().String("yurtctl-servant-image",
 		"openyurt/yurtctl-servant:latest",
 		"The yurtctl-servant image.")
+	cmd.Flags().String("kubeadm-conf-path",
+		"/etc/systemd/system/kubelet.service.d/10-kubeadm.conf",
+		"The path to the kubeadm configuration file that is used by the kubelet service to join the cluster. N.B. the path on different Linux distro may vary.")
 	cmd.Flags().String("yurt-tunnel-server-image",
 		"openyurt/yurt-tunnel-server:latest",
 		"The yurt-tunnel-server image.")
@@ -174,6 +178,12 @@ func (co *ConvertOptions) Complete(flags *pflag.FlagSet) error {
 	}
 	co.PodMainfestPath = pmp
 
+	kcp, err := flags.GetString("kubeadm-conf-path")
+	if err != nil {
+		return err
+	}
+	co.KubeadmConfPath = kcp
+
 	// parse kubeconfig and generate the clientset
 	co.clientSet, err = kubeutil.GenClientSet(flags)
 	if err != nil {
@@ -320,6 +330,7 @@ func (co *ConvertOptions) RunConvert() (err error) {
 		"yurthub_image":         co.YurhubImage,
 		"joinToken":             joinToken,
 		"pod_manifest_path":     co.PodMainfestPath,
+		"kubeadm_conf_path":     co.KubeadmConfPath,
 	}, edgeNodeNames); err != nil {
 		klog.Errorf("fail to run ServantJobs: %s", err)
 		return

diff --git a/pkg/yurtctl/cmd/revert/revert.go b/pkg/yurtctl/cmd/revert/revert.go
@@ -39,6 +39,7 @@ import (
 type RevertOptions struct {
 	clientSet           *kubernetes.Clientset
 	YurtctlServantImage string
+	KubeadmConfPath     string
 }
 
 // NewConvertOptions creates a new RevertOptions
@@ -65,6 +66,9 @@ func NewRevertCmd() *cobra.Command {
 	cmd.Flags().String("yurtctl-servant-image",
 		"openyurt/yurtctl-servant:latest",
 		"The yurtctl-servant image.")
+	cmd.Flags().String("kubeadm-conf-path",
+		"/etc/systemd/system/kubelet.service.d/10-kubeadm.conf",
+		"The path to the kubeadm configuration file that is used by the kubelet service to join the cluster. N.B. the path on different Linux distro may vary.")
 
 	return cmd
 }
@@ -77,6 +81,12 @@ func (ro *RevertOptions) Complete(flags *pflag.FlagSet) error {
 	}
 	ro.YurtctlServantImage = ycsi
 
+	kcp, err := flags.GetString("kubeadm-conf-path")
+	if err != nil {
+		return err
+	}
+	ro.KubeadmConfPath = kcp
+
 	ro.clientSet, err = kubeutil.GenClientSet(flags)
 	if err != nil {
 		return err
@@ -224,6 +234,7 @@ func (ro *RevertOptions) RunRevert() (err error) {
 		map[string]string{
 			"action":                "revert",
 			"yurtctl_servant_image": ro.YurtctlServantImage,
+			"kubeadm_conf_path":     ro.KubeadmConfPath,
 		},
 		edgeNodeNames); err != nil {
 		klog.Errorf("fail to revert edge node: %s", err)

diff --git a/pkg/yurtctl/constants/constants.go b/pkg/yurtctl/constants/constants.go
@@ -199,5 +199,9 @@ spec:
               fieldPath: spec.nodeName
         - name: STATIC_POD_PATH
           value: {{.pod_manifest_path}}
+          {{if  .kubeadm_conf_path }}
+        - name: KUBELET_SVC
+          value: {{.kubeadm_conf_path}}
+          {{end}}
 `
 )