enable arm build

redhat-nfvpe · Jan 2, 2023 · 92408c4 · 92408c4
1 parent 7c2de27
commit 92408c4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml
@@ -1,8 +1,8 @@
 name: Image build
 on: [pull_request]
 jobs:
-  build-amd64:
-    name: Image build/amd64 thin plugin
+  build:
+    name: Image build thin plugin
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
@@ -16,8 +16,9 @@ jobs:
         with:
           context: .
           push: false
-          tags: ghcr.io/${{ github.repository }}:latest-amd64
+          tags: ghcr.io/${{ github.repository }}:latest
           file: Dockerfile
+          platforms: linux/amd64,linux/arm64
 
   build-origin:
     name: Image build/origin

diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml
@@ -4,8 +4,8 @@ on:
     branches:
       - master
 jobs:
-  push-amd64:
-    name: Image push/amd64
+  push:
+    name: Image push
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
@@ -29,9 +29,10 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:latest-amd64
-            ghcr.io/${{ github.repository }}:snapshot-amd64
+            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}:snapshot
           file: Dockerfile
+          platforms: linux/amd64,linux/arm64
 
   push-origin:
     name: Image push/origin

diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml
@@ -4,8 +4,8 @@ on:
     tags:
       - v*
 jobs:
-  push-amd64:
-    name: Image push/amd64
+  push:
+    name: Image push
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
@@ -36,9 +36,10 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:stable-amd64
-            ${{ steps.docker_meta.outputs.tags }}-amd64
+            ghcr.io/${{ github.repository }}:stable
+            ${{ steps.docker_meta.outputs.tags }}
           file: Dockerfile
+          platforms: linux/amd64,linux/arm64
 
   push-origin:
     name: Image push/origin

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # This Dockerfile is used to build the image available on DockerHub
-FROM centos:centos7 as build
+FROM centos:centos8 as build
 
 # Add everything
 ADD . /usr/src/cni-route-override

diff --git a/deployments/daemonset-install.yaml b/deployments/daemonset-install.yaml
@@ -20,8 +20,6 @@ spec:
         tier: node
         app: route-override
     spec:
-      nodeSelector:
-        beta.kubernetes.io/arch: amd64
       tolerations:
         - operator: Exists
           effect: NoSchedule