solve some problems

openyurtio · Jan 19, 2021 · e2f5e52 · e2f5e52
1 parent 71c7bd2
commit e2f5e52
Show file tree

Hide file tree

Showing 12 changed files with 231 additions and 557 deletions.
diff --git a/config/yurtctl-servant/Dockerfile b/config/yurtctl-servant/Dockerfile
@@ -1,4 +1 @@
-FROM alpine:3.8
-
-RUN mkdir -p /var/lib/openyurt
-ADD setup_edgenode /var/lib/openyurt
+FROM alpine:3.8
diff --git a/config/yurtctl-servant/setup_edgenode b/config/yurtctl-servant/setup_edgenode
diff --git a/pkg/yurtctl/cmd/convert/convert.go b/pkg/yurtctl/cmd/convert/convert.go
@@ -236,13 +236,13 @@ func (co *ConvertOptions) RunConvert() (err error) {
 			continue
 		}
 		// label node as edge node
-		//klog.Infof("mark %s as the edge-node", node.GetName())
-		//edgeNodeNames = append(edgeNodeNames, node.GetName())
-		//_, err = kubeutil.LabelNode(co.clientSet,
-		//	&node, projectinfo.GetEdgeWorkerLabelKey(), "true")
-		//if err != nil {
-		//	return
-		//}
+		klog.Infof("mark %s as the edge-node", node.GetName())
+		edgeNodeNames = append(edgeNodeNames, node.GetName())
+		_, err = kubeutil.LabelNode(co.clientSet,
+			&node, projectinfo.GetEdgeWorkerLabelKey(), "true")
+		if err != nil {
+			return
+		}
 	}
 
 	// 3. deploy yurt controller manager
@@ -317,7 +317,6 @@ func (co *ConvertOptions) RunConvert() (err error) {
 	}
 	if err = kubeutil.RunServantJobs(co.clientSet, map[string]string{
 		"provider":              string(co.Provider),
-		//"action":                "convert",
 		"yurtctl_servant_image": co.YurctlServantImage,
 		"yurthub_image":         co.YurhubImage,
 		"joinToken":             joinToken,