refactor: yurtctl convert use node-servant in dispatch job (openyurti…

…o#617) 1. Remove convert cloudnode/edgenode sub command. 2. Replace the "yurt-servant" job in yurtctl with "node-servant". 3. Automatically set "--cert-ip" to yurt-tunnel-server if the user specify the tunnel server address in "yurtctl convert". 4. Add "--autonomous-nodes" option to "yurtctl convert". Co-authored-by: [email protected] <[email protected]>
MrGirl · Dec 1, 2021 · dfe309c · dfe309c
1 parent 7937de9
commit dfe309c
Show file tree

Hide file tree

Showing 15 changed files with 152 additions and 687 deletions.
diff --git a/hack/local_up_openyurt.sh b/hack/local_up_openyurt.sh
@@ -72,6 +72,7 @@ readonly BUILD_TARGETS=(
     yurtctl
     yurt-tunnel-server
     yurt-tunnel-agent
+    yurt-node-servant
 )
 
 readonly LOCAL_ARCH=$(go env GOHOSTARCH)
@@ -192,6 +193,10 @@ function kind_load_images {
         if [[ "${bin}" = "yurtctl" ]]; then
             imagename="yurtctl-servant-${postfix}"
         fi
+
+        if [[ "${bin}" = "yurt-node-servant" ]]; then
+            imagename="node-servant-${postfix}"
+        fi
 
         echo "loading image ${imagename} to nodes"
         local nodesarg=$(echo ${master} ${edgenodes[@]} | sed "s/ /,/g")
@@ -251,7 +256,7 @@ function convert_to_openyurt {
         ${yurtctl_dir}/yurtctl convert --provider kubeadm --cloud-nodes ${master} \
             --yurthub-image=$(get_image_name "yurthub" ${LOCAL_ARCH}) \
             --yurt-controller-manager-image=$(get_image_name "yurt-controller-manager" ${LOCAL_ARCH}) \
-            --yurtctl-servant-image=$(get_image_name "yurtctl-servant" ${LOCAL_ARCH})
+            --node-servant-image=$(get_image_name "node-servant" ${LOCAL_ARCH})
             # --yurt-tunnel-server-image=$(get_image_name "yurt-tunnel-server" ${LOCAL_ARCH}) \
             # --yurt-tunnel-agent-image=$(get_image_name "yurt-tunnel-agent" ${LOCAL_ARCH})
 

diff --git a/pkg/node-servant/convert/options.go b/pkg/node-servant/convert/options.go
@@ -95,7 +95,12 @@ func (o *Options) Complete(flags *pflag.FlagSet) error {
 	if err != nil {
 		return err
 	}
-	o.workingMode = util.WorkingMode(workingMode)
+
+	wm := util.WorkingMode(workingMode)
+	if !util.IsSupportedWorkingMode(wm) {
+		return fmt.Errorf("invalid working mode: %s", workingMode)
+	}
+	o.workingMode = wm
 
 	return nil
 }
diff --git a/pkg/yurtctl/cmd/convert/cloudnode.go b/pkg/yurtctl/cmd/convert/cloudnode.go