ci: add vpc-nat-gateway build

kubeovn · Oct 12, 2021 · d7edf24 · d7edf24
1 parent d8179e4
commit d7edf24
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 39 deletions.
diff --git a/.github/workflows/build-arm64-image.yaml b/.github/workflows/build-arm64-image.yaml
@@ -67,6 +67,10 @@ jobs:
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
           docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-arm
           docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn-dev:$COMMIT-arm
+          docker tag kubeovn/kube-ovn:$TAG kubeovn/vpc-nat-gateway:$TAG-arm
+          docker tag kubeovn/kube-ovn:$TAG kubeovn/vpc-nat-gateway-dev:$COMMIT-arm
           docker images
           docker push kubeovn/kube-ovn:$TAG-arm
           docker push kubeovn/kube-ovn-dev:$COMMIT-arm
+          docker push kubeovn/vpc-nat-gateway:$TAG-arm
+          docker push kubeovn/vpc-nat-gateway-dev:$COMMIT-arm
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -63,11 +63,17 @@ jobs:
           make release
           make tar
 
-      - name: Upload image to artifact
+      - name: Upload kube-ovn image to artifact
         uses: actions/upload-artifact@v2
         with:
-          name: image
-          path: image.tar
+          name: kube-ovn
+          path: kube-ovn.tar
+
+      - name: Upload vpc-nat-gateway image to artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: vpc-nat-gateway
+          path: vpc-nat-gateway.tar
 
   single-e2e:
     needs: build
@@ -93,11 +99,11 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
       - name: Set up Go 1.x
@@ -137,11 +143,11 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
       - name: Set up Go 1.x
@@ -181,11 +187,11 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
       - name: Set up Go 1.x
@@ -225,11 +231,11 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install-underlay
 
       - name: Set up Go 1.x
@@ -269,11 +275,11 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install-single
 
       - name: Set up Go 1.x
@@ -313,11 +319,11 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
   ipv6-e2e:
@@ -344,15 +350,15 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Load Image
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install-ipv6
 
       - name: Set up Go 1.x
@@ -392,15 +398,15 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Load Image
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install-ipv6
 
       - name: Set up Go 1.x
@@ -440,15 +446,15 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Load Image
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install-underlay-ipv6
 
       - name: Set up Go 1.x
@@ -488,15 +494,15 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Load Image
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
 
       - name: Install Kube-OVN
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install-dual
 
       - name: Set up Go 1.x
@@ -536,13 +542,13 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN without LoadBalancer
         env:
           ENABLE_LB: "false"
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
       - name: Set up Go 1.x
@@ -582,13 +588,13 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN without LoadBalancer
         env:
           ENABLE_LB: "false"
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
       - name: Set up Go 1.x
@@ -628,13 +634,13 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: kube-ovn
 
       - name: Install Kube-OVN without network policy support
         env:
           ENABLE_NP: "false"
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
           sudo make kind-install
 
       - name: Set up Go 1.x
@@ -671,14 +677,20 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
-      - name: Download image
+      - name: Download kube-ovn image
+        uses: actions/download-artifact@v2
+        with:
+          name: kube-ovn
+
+      - name: Download vpc-nat-gateway image
         uses: actions/download-artifact@v2
         with:
-          name: image
+          name: vpc-nat-gateway
 
       - name: Load Image
         run: |
-          docker load --input image.tar
+          docker load --input kube-ovn.tar
+          docker load --input vpc-nat-gateway.tar
 
       - name: Security Scan
         run: |
@@ -702,6 +714,10 @@ jobs:
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
           docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn-dev:$COMMIT-x86
           docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-x86
+          docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
+          docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway:$TAG-x86
           docker images
           docker push kubeovn/kube-ovn:$TAG-x86
           docker push kubeovn/kube-ovn-dev:$COMMIT-x86
+          docker push kubeovn/vpc-nat-gateway:$TAG-x86
+          docker push kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,8 @@ kube-ovn.yaml
 kube-ovn-crd.yaml
 ovn.yaml
 kind.yaml
-image.tar
+kube-ovn.tar
+vpc-nat-gateway.tar
 image-amd64.tar
 image-arm64.tar
 install-underlay.sh

diff --git a/Makefile b/Makefile
@@ -67,7 +67,8 @@ push-release: release
 
 .PHONY: tar
 tar:
-	docker save $(REGISTRY)/kube-ovn:$(RELEASE_TAG) -o image.tar
+	docker save $(REGISTRY)/kube-ovn:$(RELEASE_TAG) -o kube-ovn.tar
+	docker save $(REGISTRY)/vpc-nat-gateway:$(RELEASE_TAG) -o vpc-nat-gateway.tar
 
 .PHONY: base-tar-amd64
 base-tar-amd64:
@@ -205,6 +206,7 @@ lint:
 .PHONY: scan
 scan:
 	trivy image --light --exit-code=1 --severity=HIGH --ignore-unfixed kubeovn/kube-ovn:$(RELEASE_TAG)
+	trivy image --light --exit-code=1 --severity=HIGH --ignore-unfixed kubeovn/vpc-nat-gateway:$(RELEASE_TAG)
 
 .PHONY: ut
 ut:
@@ -262,6 +264,6 @@ clean:
 	$(RM) dist/images/kube-ovn dist/images/kube-ovn-cmd
 	$(RM) yamls/kind.yaml
 	$(RM) ovn.yaml kube-ovn.yaml kube-ovn-crd.yaml
-	$(RM) image.tar image-amd64.tar image-arm64.tar
+	$(RM) kube-ovn.tar vpc-nat-gateway.tar image-amd64.tar image-arm64.tar
 	$(RM) test/e2e/ovnnb_db.* test/e2e/ovnsb_db.*
 	$(RM) install-underlay.sh