Merge pull request #495 from village-way/main

add make node-agent target and improve the cmd return formate

Makefile

@@ -16,6 +16,7 @@ MACOS_TARGETS := clusterlink-controller-manager \
 				 clusterlink-proxy \
 				 clustertree-cluster-manager \
 				 virtual-cluster-operator \
+				 node-agent \
 				 scheduler \
 
 # clusterlink-agent and clusterlink-floater only support linux platform
@@ -28,6 +29,7 @@ TARGETS :=  clusterlink-controller-manager \
 			clusterlink-proxy \
 			clustertree-cluster-manager \
 			virtual-cluster-operator \
+			node-agent \
 			scheduler \
 
 # If GOOS is macOS, assign the value of MACOS_TARGETS to TARGETS
@@ -125,7 +127,8 @@ upload-images: images
 	docker push ${REGISTRY}/clusterlink-floater:${VERSION}
 	docker push ${REGISTRY}/clusterlink-elector:${VERSION}
 	docker push ${REGISTRY}/clustertree-cluster-manager:${VERSION}
-    docker push ${REGISTRY}/virtual-cluster-operator:${VERSION}
+	docker push ${REGISTRY}/virtual-cluster-operator:${VERSION}
+	docker push ${REGISTRY}/node-agent:${VERSION}
 	docker push ${REGISTRY}/scheduler:${VERSION}
 
 .PHONY: release

cluster/images/agent.Dockerfile

@@ -0,0 +1,17 @@
+FROM ubuntu:latest as release-env
+
+ARG BINARY
+
+WORKDIR /app
+# copy install file to container
+# build context is _output/xx/xx
+COPY agent/* .
+
+# install rsync
+RUN apt-get update && apt-get install -y rsync pwgen openssl && \
+    openssl req -x509 -sha256 -new -nodes -days 3650 -newkey rsa:2048 -keyout key.pem -out cert.pem -subj "/C=CN/O=Kosmos/OU=Kosmos/CN=kosmos.io"
+
+COPY ${BINARY} /app
+
+# install command
+CMD ["bash", "/app/install.sh", "/app"]

cluster/images/buildx.agent.Dockerfile

@@ -0,0 +1,17 @@
+FROM ubuntu:latest as release-env
+
+ARG BINARY
+ARG TARGETPLATFORM
+
+WORKDIR /app
+# copy install file to container
+COPY ${TARGETPLATFORM}/agent/* .
+
+# install rsync
+RUN apt-get update && apt-get install -y rsync pwgen openssl && \
+    openssl req -x509 -sha256 -new -nodes -days 3650 -newkey rsa:2048 -keyout key.pem -out cert.pem -subj "/C=CN/O=Kosmos/OU=Kosmos/CN=kosmos.io"
+
+COPY ${TARGETPLATFORM}/${BINARY} /app
+
+# install command
+CMD ["bash", "/app/install.sh", "/app"]

cmd/kubenest/node-agent/go/app.go → cmd/kubenest/node-agent/app.go

@@ -211,7 +211,7 @@ func handleCmd(conn *websocket.Conn, params url.Values) {
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Warnf("failed to execute command : %v", err)
-		_ = conn.WriteMessage(websocket.TextMessage, []byte(err.Error()))
+		_ = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, fmt.Sprintf("%d", cmd.ProcessState.ExitCode())))
 	} else {
 		_ = conn.WriteMessage(websocket.TextMessage, out)
 	}