ci: fix dpdk jobs (#3405)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
kubeovn · Nov 15, 2023 · a54fcfe · a54fcfe
1 parent 0fe59db
commit a54fcfe
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 50 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -31,7 +31,7 @@ jobs:
     name: Build kube-ovn-base
     runs-on: ubuntu-22.04
     outputs:
-      build-base: ${{ steps.build.outputs.build-base }}
+      build-base: ${{ steps.check.outputs.build-base }}
     steps:
       - uses: jlumbroso/free-disk-space@v1.3.1
         with:
@@ -52,25 +52,22 @@ jobs:
           if [ ${{ github.event_name }} != 'pull_request' ]; then
             exit
           fi
-          if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base; then
-            echo buildx=1 >> "$GITHUB_OUTPUT"
+          if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base$; then
+            echo build-base=1 >> "$GITHUB_OUTPUT"
           fi
 
-      - uses: docker/setup-buildx-action@v2
-        if: steps.check.outputs.buildx == 1
+      - uses: docker/setup-buildx-action@v3
+        if: steps.check.outputs.build-base == 1
 
       - name: Build kube-ovn-base image
         id: build
-        if: steps.check.outputs.buildx == 1
+        if: steps.check.outputs.build-base == 1
         run: |
-          if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base$; then
             make base-amd64
             make base-tar-amd64
-            echo build-base=1 >> "$GITHUB_OUTPUT"
-          fi
 
       - name: Upload base images to artifact
-        if: steps.build.outputs.build-base == 1
+        if: steps.check.outputs.build-base == 1
         uses: actions/upload-artifact@v3
         with:
           name: kube-ovn-base
@@ -80,7 +77,7 @@ jobs:
     name: Build kube-ovn-dpdk-base
     runs-on: ubuntu-22.04
     outputs:
-      build-base: ${{ steps.build.outputs.build-dpdk-base }}
+      build-dpdk-base: ${{ steps.check.outputs.build-dpdk-base }}
     steps:
       - uses: jlumbroso/free-disk-space@v1.3.1
         with:
@@ -101,24 +98,22 @@ jobs:
           if [ ${{ github.event_name }} != 'pull_request' ]; then
             exit
           fi
-          if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base; then
-            echo buildx=1 >> "$GITHUB_OUTPUT"
+          if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base-dpdk$; then
+            echo build-dpdk-base=1 >> "$GITHUB_OUTPUT"
           fi
 
       - uses: docker/setup-buildx-action@v3
-        if: steps.check.outputs.buildx == 1
+        if: steps.check.outputs.build-dpdk-base == 1
 
       - name: Build kube-ovn-dpdk-base image
         id: build
-        if: steps.check.outputs.buildx == 1
+        if: steps.check.outputs.build-dpdk-base == 1
         run: |
-          if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base-dpdk$; then
-            make base-amd64-dpdk
-            echo build-dpdk-base=1 >> "$GITHUB_OUTPUT"
-          fi
+          make base-amd64-dpdk
+          make base-tar-amd64-dpdk
 
       - name: Upload dpdk base images to artifact
-        if: steps.build.outputs.build-dpdk-base == 1
+        if: steps.check.outputs.build-dpdk-base == 1
         uses: actions/upload-artifact@v3
         with:
           name: kube-ovn-dpdk-base
@@ -127,7 +122,9 @@ jobs:
   build-kube-ovn:
     name: Build kube-ovn
     runs-on: ubuntu-22.04
-    needs: build-kube-ovn-base
+    needs:
+      - build-kube-ovn-base
+      - build-kube-ovn-dpdk-base
     steps:
       - uses: jlumbroso/free-disk-space@v1.3.1
         with:
@@ -203,19 +200,36 @@ jobs:
             TAG=$(cat VERSION)
             docker tag kubeovn/kube-ovn-base:$TAG-amd64 kubeovn/kube-ovn-base:$TAG
             docker tag kubeovn/kube-ovn-base:$TAG-debug-amd64 kubeovn/kube-ovn-base:$TAG-debug
-            docker tag kubeovn/kube-ovn-base:$TAG-amd64-dpdk kubeovn/kube-ovn-base:$TAG-dpdk
             make build-kube-ovn
           else
             make image-kube-ovn
           fi
           make tar-kube-ovn
 
+      - name: Build dpdk
+        run: |
+          if [ ${{ needs.build-kube-ovn-dpdk-base.outputs.build-dpdk-base || 0 }} = 1 ]; then
+            TAG=$(cat VERSION)
+            docker tag kubeovn/kube-ovn-base:$TAG-amd64-dpdk kubeovn/kube-ovn-base:$TAG-dpdk
+            make build-kube-ovn-dpdk
+          else
+            make image-kube-ovn-dpdk
+          fi
+          make tar-kube-ovn-dpdk
+
       - name: Upload images to artifact
         uses: actions/upload-artifact@v3
         with:
           name: kube-ovn
           path: kube-ovn.tar
 
+      - name: Upload dpdk images to artifact
+        uses: actions/upload-artifact@v3
+        if: github.event_name != 'pull_request'
+        with:
+          name: kube-ovn-dpdk
+          path: kube-ovn-dpdk.tar
+
   build-vpc-nat-gateway:
     name: Build vpc-nat-gateway
     runs-on: ubuntu-22.04
@@ -2370,6 +2384,12 @@ jobs:
         with:
           name: kube-ovn
 
+      - name: Download kube-ovn-dpdk image
+        uses: actions/download-artifact@v3
+        if: github.event_name != 'pull_request'
+        with:
+          name: kube-ovn-dpdk
+
       - name: Download vpc-nat-gateway image
         uses: actions/download-artifact@v3
         with:
@@ -2391,6 +2411,9 @@ jobs:
           docker load --input vpc-nat-gateway.tar
           docker load --input centos7-compile.tar
           # docker load --input centos8-compile.tar
+          if [ '${{ github.event_name }}' != 'pull_request' ]; then
+            docker load --input kube-ovn-dpdk.tar
+          fi
 
       - name: Security Scan
         run: |

diff --git a/.gitignore b/.gitignore
@@ -23,8 +23,10 @@ broker-info.subm
 broker-info.subm.*
 broker-info-internal.subm
 kube-ovn.tar
+kube-ovn-dpdk.tar
 vpc-nat-gateway.tar
 image-amd64.tar
+image-amd64-dpdk.tar
 image-arm64.tar
 test/**/*.test
 kube-ovn-app-sa.yaml

diff --git a/Makefile b/Makefile
@@ -94,7 +94,10 @@ build-go-arm:
 build-kube-ovn: build-go
 	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG) --build-arg VERSION=$(RELEASE_TAG) -f dist/images/Dockerfile dist/images/
 	docker build -t $(REGISTRY)/kube-ovn:$(DEBUG_TAG) --build-arg BASE_TAG=$(DEBUG_TAG) -f dist/images/Dockerfile dist/images/
-	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk -f dist/images/Dockerfile.dpdk dist/images/
+
+.PHONY: build-kube-ovn-dpdk
+build-kube-ovn-dpdk: build-go
+	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk --build-arg BASE_TAG=$(RELEASE_TAG)-dpdk -f dist/images/Dockerfile dist/images/
 
 .PHONY: build-dev
 build-dev: build-go
@@ -126,7 +129,10 @@ base-arm64:
 image-kube-ovn: build-go
 	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG) --build-arg VERSION=$(RELEASE_TAG) -o type=docker -f dist/images/Dockerfile dist/images/
 	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(DEBUG_TAG) --build-arg BASE_TAG=$(DEBUG_TAG) -o type=docker -f dist/images/Dockerfile dist/images/
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk --build-arg VERSION=$(RELEASE_TAG) -o type=docker -f dist/images/Dockerfile.dpdk dist/images/
+
+.PHONY: image-kube-ovn-dpdk
+image-kube-ovn-dpdk: build-go
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk --build-arg VERSION=$(RELEASE_TAG) --build-arg BASE_TAG=$(RELEASE_TAG)-dpdk -o type=docker -f dist/images/Dockerfile dist/images/
 
 .PHONY: image-vpc-nat-gateway
 image-vpc-nat-gateway:
@@ -160,7 +166,11 @@ push-release: release
 
 .PHONY: tar-kube-ovn
 tar-kube-ovn:
-	docker save $(REGISTRY)/kube-ovn:$(RELEASE_TAG) $(REGISTRY)/kube-ovn:$(DEBUG_TAG) $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk -o kube-ovn.tar
+	docker save $(REGISTRY)/kube-ovn:$(RELEASE_TAG) $(REGISTRY)/kube-ovn:$(DEBUG_TAG) -o kube-ovn.tar
+
+.PHONY: tar-kube-ovn-dpdk
+tar-kube-ovn-dpdk:
+	docker save $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk -o kube-ovn-dpdk.tar
 
 .PHONY: tar-vpc-nat-gateway
 tar-vpc-nat-gateway:
@@ -868,7 +878,7 @@ clean:
 	$(RM) ovn.yaml kube-ovn.yaml kube-ovn-crd.yaml
 	$(RM) ovn-ic-0.yaml ovn-ic-1.yaml
 	$(RM) kustomization.yaml kwok.yaml kwok-node.yaml
-	$(RM) kube-ovn.tar vpc-nat-gateway.tar image-amd64.tar image-arm64.tar
+	$(RM) kube-ovn.tar kube-ovn-dpdk.tar vpc-nat-gateway.tar image-amd64.tar image-amd64-dpdk.tar image-arm64.tar
 
 .PHONY: changelog
 changelog:

diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base
@@ -97,7 +97,7 @@ ARG ARCH
 ENV CNI_VERSION=v1.3.0
 RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan
 
-ENV KUBE_VERSION="v1.28.2"
+ENV KUBE_VERSION="v1.28.3"
 
 RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \
  && chmod +x /usr/bin/kubectl && rm -rf ./kubernetes

diff --git a/dist/images/Dockerfile.dpdk b/dist/images/Dockerfile.dpdk