chore: add cni-vpc-node image

Author: fioncat

.github/workflows/release.yml

@@ -29,26 +29,33 @@ jobs:
       with:
         go-version: 1.20.5
 
+    - name: Build cnivpc
+      run: DEPLOY=true make cnivpc
+
     - name: Build ipamd
       run: DEPLOY=true make ipamd
 
     - name: Build vip-controller
       run: DEPLOY=true make vip-controller
 
-    - name: Build cni
-      run: make cni
-
     - name: Package cni
       run: >
         tar -cv
         LICENSE README.md
         -C bin/ cnivpc cnivpctl
+        -C config/ 10-cnivpc.conf
         | gzip --best
         > 'uk8s-cni-vpc_${{ steps.get_version.outputs.VERSION }}.tar.gz'
 
     - name: Create release
       uses: softprops/action-gh-release@v1
       with:
         draft: true
+        body: |
+          ## Docker Images
+
+          - uhub.service.ucloud.cn/uk8s/cni-vpc-node:${{ steps.get_version.outputs.VERSION }}
+          - uhub.service.ucloud.cn/uk8s/cni-vpc-ipamd:${{ steps.get_version.outputs.VERSION }}
+          - uhub.service.ucloud.cn/uk8s/vip-controller:${{ steps.get_version.outputs.VERSION }}
         files: |
           *.tar.gz

Makefile

@@ -24,18 +24,25 @@ DOCKER_TEST_BUCKET=uhub.service.ucloud.cn/wxyz
 DOCKER_LABEL:=$(if $(DEPLOY),$(CNI_VERSION),dev-$(COMMIT_ID_SHORT))
 DOCKER_BUCKET:=$(if $(DEPLOY),$(DOCKER_DEPLOY_BUCKET),$(DOCKER_TEST_BUCKET))
 
+CNIVPC_IMAGE:=$(DOCKER_BUCKET)/cni-vpc-node:$(DOCKER_LABEL)
 IPAMD_IMAGE:=$(DOCKER_BUCKET)/cni-vpc-ipamd:$(DOCKER_LABEL)
 VIP_CONTROLLER_IMAGE:=$(DOCKER_BUCKET)/vip-controller:$(DOCKER_LABEL)
 
 DOCKER_CMD:=$(if $(DOCKER_CMD),$(DOCKER_CMD),docker)
 
-all: cni
+all: cnivpc
 
-.PHONY: cni
-cni:
+.PHONY: cnivpc-bin
+cnivpc-bin:
 	go build ${LDFLAGS} -o ./bin/cnivpc ./cmd/cnivpc
 	go build ${LDFLAGS} -o ./bin/cnivpctl ./cmd/cnivpctl
 
+.PHONY: cnivpc
+cnivpc: cnivpc-bin
+	$(DOCKER_CMD) build -t $(CNIVPC_IMAGE) -f dockerfiles/cnivpc/Dockerfile .
+	$(DOCKER_CMD) push $(CNIVPC_IMAGE)
+	@echo "Build done: $(CNIVPC_IMAGE)"
+
 .PHONY: ipamd
 ipamd:
 	go build ${LDFLAGS} -o ./bin/cnivpc-ipamd ./cmd/cnivpc-ipamd

deploy/node.yml

@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: cni-vpc-node
+  namespace: kube-system
+  labels:
+    app: "cni-vpc-node"
+spec:
+  selector:
+    matchLabels:
+      app: "cni-vpc-node"
+  template:
+    metadata:
+      labels:
+         app: "cni-vpc-node"
+    spec:
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - key: dedicated
+        operator: Exists
+      - effect: NoSchedule
+        key: node.cloudprovider.kubernetes.io/uninitialized
+        value: "true"
+      hostNetwork: true
+      priorityClassName: system-node-critical
+      hostPID: true
+      containers:
+        - name: cni-vpc-node
+          image: uhub.service.ucloud.cn/uk8s/cni-vpc-node:1.0.1
+          securityContext:
+            privileged: true
+          imagePullPolicy: "Always"
+          volumeMounts:
+            - name: host-cni
+              mountPath: /opt/cni/
+            - name: host-bin
+              mountPath: /host-bin
+            - name: host-log
+              mountPath: /var/log
+              readOnly: true
+      volumes:
+        - name: host-cni
+          hostPath:
+            path: /opt/cni
+        - name: host-bin
+          hostPath:
+            path: /usr/local/bin
+        - name: host-log
+          hostPath:
+            path: /var/log

dockerfiles/cnivpc/Dockerfile

@@ -0,0 +1,8 @@
+FROM alpine:latest
+
+COPY bin/cnivpc /usr/local/bin/
+COPY bin/cnivpctl /usr/local/bin/
+COPY scripts/cnivpc-docker-entrypoint.sh /entrypoint.sh
+COPY config/10-cnivpc.conf /10-cnivpc.conf
+
+ENTRYPOINT [ "/entrypoint.sh" ]

scripts/cnivpc-docker-entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [[ -d /opt/cni ]]; then
+	cp -f /usr/local/bin/cnivpc /opt/cni/bin/cnivpc
+	cp -f /10-cnivpc.conf /opt/cni/net.d/10-cnivpc.conf
+fi
+
+if [[ -d /host-bin ]]; then
+	cp -f /usr/local/bin/cnivpctl /host-bin/cnivpctl
+fi
+
+while true; do
+	if [[ ! -f "/var/log/cnivpc.log" ]]; then
+		echo "waitting for cnivpc logs..."
+		sleep 3
+		continue
+	fi
+	tail -f /var/log/cnivpc.log
+done