Merge pull request #527 from leakingtapan/arm

Add arm support
kubernetes-sigs · Aug 27, 2020 · b0079ef · b0079ef
2 parents fc47b6e + 5a49cb6
commit b0079ef
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/container-image.yaml b/.github/workflows/container-image.yaml
@@ -8,9 +8,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v3
+      with:
+        buildx-version: latest
+        qemu-version: latest
     - name: Build container image
       run: |
-        docker build -t aws-ebs-csi-driver .
+        docker buildx build \
+          -t aws-ebs-csi-driver \
+          --platform=linux/arm64,linux/amd64 \
+          --output="type=image,push=false" .
     - name: Push to Github registry
       run: |
         USER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
@@ -22,6 +31,7 @@ jobs:
           TAG=$BRANCH
         fi
         docker login docker.pkg.github.com -u $USER -p ${{ secrets.REGISTRY_TOKEN }}
+        docker build -t aws-ebs-csi-driver .
         docker tag aws-ebs-csi-driver docker.pkg.github.com/$GITHUB_REPOSITORY/$IMAGE:$TAG
         docker push docker.pkg.github.com/$GITHUB_REPOSITORY/$IMAGE:$TAG
     - name: Push to Dockerhub registry
@@ -34,5 +44,8 @@ jobs:
           TAG=$BRANCH
         fi
         docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-        docker tag aws-ebs-csi-driver $REPO:$TAG
-        docker push $REPO:$TAG
+        docker buildx build \
+          -t $REPO:$TAG \
+          --platform=linux/arm64,linux/amd64 \
+          --output="type=image,push=true" .
+
diff --git a/aws-ebs-csi-driver/templates/controller.yaml b/aws-ebs-csi-driver/templates/controller.yaml
@@ -23,7 +23,6 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
         {{- with .Values.nodeSelector }}
 {{ toYaml . | indent 8 }}
         {{- end }}

diff --git a/aws-ebs-csi-driver/templates/node.yaml b/aws-ebs-csi-driver/templates/node.yaml
@@ -31,7 +31,6 @@ spec:
                 - fargate
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
       hostNetwork: true
       priorityClassName: system-node-critical
       tolerations:

diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
@@ -22,7 +22,6 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
       serviceAccountName: ebs-csi-controller-sa
       priorityClassName: system-cluster-critical
       tolerations:

diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
@@ -30,7 +30,6 @@ spec:
                 - fargate
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
       hostNetwork: true
       priorityClassName: system-node-critical
       tolerations: