fix: cmd execute exit code formate improve and add make node-agent ta…

…rget

Signed-off-by: wangdepeng <[email protected]>
(cherry picked from commit 5853e67)

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,21 @@
+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" && \
+    WEB_USER=agent && \
+    WEB_PASS=$(pwgen -y 12 1) && \
+    sed -i "s/{{WEB_USER}}/$WEB_USER/g" agent.env && \
+    sed -i "s/{{WEB_PASS}}/$WEB_PASS/g" agent.env
+
+COPY ${BINARY} /app
+
+# install command
+CMD ["bash", "/app/install.sh", "/app"]

cluster/images/buildx.agent.Dockerfile

@@ -0,0 +1,21 @@
+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" && \
+    WEB_USER=agent && \
+    WEB_PASS=$(pwgen -y 12 1) && \
+    sed -i "s/{{WEB_USER}}/$WEB_USER/g" agent.env && \
+    sed -i "s/{{WEB_PASS}}/$WEB_PASS/g" agent.env
+
+COPY ${TARGETPLATFORM}/${BINARY} /app
+
+# install command
+CMD ["bash", "/app/install.sh", "/app"]

cmd/kubenest/node-agent/go/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)
 	}

cmd/kubenest/node-agent/go/app_test.go

@@ -125,6 +125,16 @@ func handleMessages(ws *websocket.Conn) {
 }
 
 func sendFile(ws *websocket.Conn, filePath string) {
+	//if file not exists, close connection
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		log.Printf("File not exists: %v", err)
+		err := ws.WriteMessage(websocket.BinaryMessage, []byte("EOF"))
+		if err != nil {
+			log.Printf("Write message error: %v", err)
+		}
+		return
+	}
+
 	file, err := os.Open(filePath)
 	if err != nil {
 		log.Printf("File open error: %v", err)

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

@@ -77,12 +77,14 @@ def create_self_signed_cert():
     pkey.generate_key(crypto.TYPE_RSA, 2048)
 
     cert = crypto.X509()
-    cert.get_subject().C = "CN"  # country
-    cert.get_subject().ST = "JiangShu" # state
-    cert.get_subject().L = "ShuZhou" # city
-    cert.get_subject().O = "Kosmos" # object
-    cert.get_subject().OU = "Kosmos" # unit
-    cert.get_subject().CN = "kosmos.io"  # domain
+    # country
+    cert.get_subject().C = "CN"
+    # object
+    cert.get_subject().O = "Kosmos"
+    # unit
+    cert.get_subject().OU = "Kosmos"
+    # domain
+    cert.get_subject().CN = "kosmos.io"
 
     cert.set_serial_number(1000)
     cert.gmtime_adj_notBefore(0)

go.mod

@@ -28,6 +28,7 @@ require (
 	golang.org/x/sys v0.12.0
 	golang.org/x/time v0.3.0
 	golang.org/x/tools v0.13.0
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.26.3
 	k8s.io/apiextensions-apiserver v0.26.3
 	k8s.io/apimachinery v0.26.3
@@ -176,7 +177,6 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/cloud-provider v0.26.3 // indirect
 	k8s.io/csi-translation-lib v0.26.3 // indirect
 	k8s.io/dynamic-resource-allocation v0.0.0 // indirect

hack/build.sh

@@ -52,6 +52,10 @@ function build_binary_for_platform() {
       -ldflags "${LDFLAGS:-}" \
       -o "_output/bin/${platform}/$target" \
       "${target_pkg}"
+  # copy file
+  echo "${REPO_ROOT}/hack/node-agent" "_output/bin/${platform}/$target"
+  mkdir -p "_output/bin/${platform}/agent"
+  cp "${REPO_ROOT}/hack/node-agent"/* "_output/bin/${platform}/agent"
   set +x
 }
 

hack/docker.sh

@@ -40,6 +40,8 @@ function build_images() {
   local dockerfile="Dockerfile"
   if [[ "${target}" == "clusterlink-floater" ]]; then
     dockerfile="floater.Dockerfile"
+  elif [[ "${target}" == "node-agent" ]]; then
+    dockerfile="agent.Dockerfile"
   fi
 
   # Preferentially use `docker build`. If we are building multi platform,

hack/node-agent/agent.env

@@ -0,0 +1,2 @@
+WEB_USER={{WEB_USER}}
+WEB_PASS={{WEB_PASS}}

hack/release.sh

@@ -30,6 +30,9 @@ function release_binary_for_platform() {
       -ldflags "${LDFLAGS:-}" \
       -o "_output/release/$target-${platform}" \
       "${target_pkg}"
+  # copy node-agent files
+  mkdir -p "_output/release/$target-${platform}/agent"
+  cp "${REPO_ROOT}/hack/node-agent"/* "_output/release/$target-${platform}/agent"
   set +x
 }
 

hack/util.sh

@@ -23,6 +23,7 @@ CLUSTERLINK_TARGET_SOURCE=(
   clusterlink-controller-manager=cmd/clusterlink/controller-manager
   clustertree-cluster-manager=cmd/clustertree/cluster-manager
   virtual-cluster-operator=cmd/kubenest/operator
+  node-agent=cmd/kubenest/node-agent/go
   kosmosctl=cmd/kosmosctl
 )