update makefile, hack, build and ci files

Signed-off-by: Poorunga <2744323@qq.com>

.github/workflows/main.yaml

@@ -44,6 +44,7 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     name: Build binary
     steps:
       - name: Install Go
@@ -65,6 +66,7 @@ jobs:
 
   docker_build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     name: Docker image build
     steps:
       - name: Install Go
@@ -82,4 +84,4 @@ jobs:
         with:
           fetch-depth: 0
 
-      - run: make images
+      - run: make agentimage

Makefile

@@ -14,9 +14,13 @@
 
 GOPATH?=$(shell go env GOPATH)
 
-# make binaries
-BINARIES=edgemesh
+# make all builds both agent and server binaries
 
+BINARIES=edgemesh-agent \
+         edgemesh-server
+
+COMPONENTS=agent \
+           server
 
 .EXPORT_ALL_VARIABLES:
 OUT_DIR ?= _output/local
@@ -33,8 +37,8 @@ define ALL_HELP_INFO
 #   make
 #   make all
 #   make all HELP=y
-#   make all WHAT=edgemesh
-#   make all WHAT=edgemesh GOLDFLAGS="" GOGCFLAGS="-N -l"
+#   make all WHAT=edgemesh-agent
+#   make all WHAT=edgemesh-agent GOLDFLAGS="" GOGCFLAGS="-N -l"
 #     Note: Specify GOLDFLAGS as an empty string for building unstripped binaries, specify GOGCFLAGS
 #     to "-N -l" to disable optimizations and inlining, this will be helpful when you want to
 #     use the debugging tools like delve. When GOLDFLAGS is unspecified, it defaults to "-s -w" which strips
@@ -111,10 +115,10 @@ clean:
 endif
 
 
+ARCH ?= amd64
 IMAGE_TAG ?= $(shell git describe --tags)
 GO_LDFLAGS='$(shell hack/make-rules/version.sh)'
 
-.PHONY: images
-images:
-	docker build --build-arg GO_LDFLAGS=${GO_LDFLAGS} -t kubeedge/edgemesh:${IMAGE_TAG} -f build/Dockerfile .
-
+.PHONY: agentimage
+agentimage:
+	docker build --build-arg GO_LDFLAGS=${GO_LDFLAGS} -t kubeedge/edgemesh-agent:${IMAGE_TAG} -f build/agent/Dockerfile .

build/Dockerfile → build/agent/Dockerfile

@@ -13,14 +13,14 @@ RUN apk update && apk add gcc && \
 WORKDIR /code
 COPY . .
 
-RUN CGO_ENABLED=1 go build -v -o /usr/local/bin/edgemesh -ldflags "$GO_LDFLAGS -w -s" \
-./cmd/edgemesh/edgemesh.go
+RUN CGO_ENABLED=1 go build -v -o /usr/local/bin/edgemesh-agent -ldflags "$GO_LDFLAGS -w -s" \
+./agent/cmd/edgemesh-agent/agent.go
 
 
 FROM alpine:3.11
 
 RUN apk update && apk --no-cache add iptables
 
-COPY --from=builder /usr/local/bin/edgemesh /usr/local/bin/edgemesh
+COPY --from=builder /usr/local/bin/edgemesh-agent /usr/local/bin/edgemesh-agent
 
-ENTRYPOINT ["edgemesh"]
+ENTRYPOINT ["edgemesh-agent"]

build/agent/kubernetes/edgemesh-agent/03-configmap.yaml

@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: edgemesh-agent-cfg
+  namespace: kubeedge
+  labels:
+    k8s-app: kubeedge
+    kubeedge: edgemesh
+data:
+  edgemesh.yaml: |
+    apiVersion: agent.edgemesh.config.kubeedge.io/v1alpha1
+    kind: EdgeMeshAgent
+    kubeAPIConfig:
+      burst: 200
+      contentType: application/vnd.kubernetes.protobuf
+      kubeConfig: ""
+      master: "http://127.0.0.1:10550"
+      qps: 100
+    goChassisConfig:
+      protocol:
+        tcpBufferSize: 8192
+        tcpClientTimeout: 5
+        tcpReconnectTimes: 3
+      loadBalancer:
+        defaultLBStrategy: RoundRobin
+        supportLBStrategies:
+          - RoundRobin
+          - Random
+          - ConsistentHash
+        consistentHash:
+          partitionCount: 100
+          replicationFactor: 10
+          load: 1.25
+    modules:
+      edgeDNS:
+        enable: true
+        listenInterface: docker0
+        listenPort: 53
+      edgeProxy:
+        enable: true
+        subNet: 10.10.0.0/16
+        listenInterface: docker0
+        listenPort: 40001
+      edgeGateway:
+        enable: false
+        nic: "*"
+        includeIP: "*"
+        excludeIP: "*"

build/kubernetes/edgemesh/04-daemonset.yaml → build/agent/kubernetes/edgemesh-agent/04-daemonset.yaml

@@ -1,21 +1,21 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: edgemesh
+  name: edgemesh-agent
   namespace: kubeedge
   labels:
     k8s-app: kubeedge
-    kubeedge: edgemesh
+    kubeedge: edgemesh-agent
 spec:
   selector:
     matchLabels:
       k8s-app: kubeedge
-      kubeedge: edgemesh
+      kubeedge: edgemesh-agent
   template:
     metadata:
       labels:
         k8s-app: kubeedge
-        kubeedge: edgemesh
+        kubeedge: edgemesh-agent
     spec:
       affinity:
         nodeAffinity:
@@ -28,10 +28,10 @@ spec:
                     operator: Exists
       hostNetwork: true
       containers:
-        - name: edgemesh
+        - name: edgemesh-agent
           securityContext:
             privileged: true
-          image: poorunga/edgemesh:0.1
+          image: kubeedge/edgemesh-agent:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -48,7 +48,7 @@ spec:
       volumes:
         - name: conf
           configMap:
-            name: edgemesh-cfg
+            name: edgemesh-agent-cfg
         - name: resolv
           hostPath:
             path: /etc/resolv.conf

build/agent/kubernetes/edgemesh-gateway/03-configmap.yaml

@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: edgemesh-gateway-cfg
+  namespace: kubeedge
+  labels:
+    k8s-app: kubeedge
+    kubeedge: edgemesh-gateway
+data:
+  edgemesh.yaml: |
+    apiVersion: agent.edgemesh.config.kubeedge.io/v1alpha1
+    kind: EdgeMeshAgent
+    kubeAPIConfig:
+      burst: 200
+      contentType: application/vnd.kubernetes.protobuf
+      kubeConfig: ""
+      master: "http://127.0.0.1:10550"
+      qps: 100
+    goChassisConfig:
+      protocol:
+        tcpBufferSize: 8192
+        tcpClientTimeout: 5
+        tcpReconnectTimes: 3
+      loadBalancer:
+        defaultLBStrategy: RoundRobin
+        supportLBStrategies:
+          - RoundRobin
+          - Random
+          - ConsistentHash
+        consistentHash:
+          partitionCount: 100
+          replicationFactor: 10
+          load: 1.25
+    modules:
+      edgeDNS:
+        enable: false
+        listenInterface: docker0
+        listenPort: 53
+      edgeProxy:
+        enable: false
+        subNet: 10.10.0.0/16
+        listenInterface: docker0
+        listenPort: 40001
+      edgeGateway:
+        enable: true
+        nic: "*"
+        includeIP: "*"
+        excludeIP: "*"

build/kubernetes/edgemesh-gateway/04-deployment.yaml → build/agent/kubernetes/edgemesh-gateway/04-deployment.yaml

@@ -23,7 +23,7 @@ spec:
         - name: edgemesh-gateway
           securityContext:
             privileged: true
-          image: poorunga/edgemesh:0.1
+          image: kubeedge/edgemesh-agent:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:

hack/lib/golang.sh

@@ -152,7 +152,8 @@ edgemesh::check::env() {
 }
 
 ALL_BINARIES_AND_TARGETS=(
-  edgemesh:cmd/edgemesh
+  edgemesh-agent:agent/cmd/edgemesh-agent
+  # edgemesh-server:server/cmd/edgemesh-server
 )
 
 edgemesh::golang::get_target_by_binary() {