ci: cluster-autoscaler multiarch build

neondatabase · Oct 29, 2024 · 3e193a1 · 3e193a1
1 parent fdb487d
commit 3e193a1
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 32 deletions.
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -119,7 +119,7 @@ jobs:
 
     strategy:
       matrix:
-        arch: [ 'amd64', 'arm64' ]
+        arch: [ amd64, arm64 ]
     runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', matrix.arch == 'arm64' && 'large-arm64' || 'large')) }}
 
     services:
@@ -314,19 +314,20 @@ jobs:
           build-args: |
             GO_BASE_IMG=${{ env.GO_BASE_IMG }}
             GIT_INFO=${{ steps.get-git-info.outputs.info }}
-      # TODO: AUTOSCALER IMAGE IS HARDCODED FOR AMD
-      # - name: Build and push cluster-autoscaler image
-      #   uses: docker/build-push-action@v6
-      #   if: ${{ format('{0}', inputs.build-cluster-autoscaler) == 'true' }}
-      #   with:
-      #     context: cluster-autoscaler
-
-      #     push: true
-      #     tags: ${{ needs.tags.outputs.cluster-autoscaler }}
-      #     cache-from: type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache
-      #     cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache,mode=max' || '' }}
-      #     build-args: |
-      #       CA_GIT_TAG=${{ steps.get-ca-tag.outputs.tag }}
+      
+      - name: Build and push cluster-autoscaler image
+        uses: docker/build-push-action@v6
+        if: ${{ format('{0}', inputs.build-cluster-autoscaler) == 'true' }}
+        with:
+          context: cluster-autoscaler
+          platforms: linux/${{ matrix.arch }}
+          push: true
+          target: ${{format('cluster_autoscaler_{0}', matrix.arch)}}
+          tags: ${{ needs.tags.outputs.cluster-autoscaler }}
+          cache-from: type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache
+          cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache,mode=max' || '' }}
+          build-args: |
+            CA_GIT_TAG=${{ steps.get-ca-tag.outputs.tag }}
 
       # - name: Copy all images to ECR
       #   if: ${{ format('{0}', inputs.upload-to-ecr) == 'true' }}

diff --git a/.github/workflows/check-ca-builds.yaml b/.github/workflows/check-ca-builds.yaml
@@ -1,23 +1,27 @@
 name: check-cluster-autoscaler-builds
-on: {}
-  # pull_request:
-  #   paths:
-  #     - "cluster-autoscaler/ca.tag"
-  #     - "cluster-autoscaler/ca.patch"
-  #     - "cluster-autoscaler/Dockerfile"
-  #     - ".github/workflows/check-ca-builds.yaml"
-  # push:
-  #   branches:
-  #     - main
-  #   paths:
-  #     - "cluster-autoscaler/ca.tag"
-  #     - "cluster-autoscaler/ca.patch"
-  #     - "cluster-autoscaler/Dockerfile"
-  #     - ".github/workflows/check-ca-builds.yaml"
+on:
+  pull_request:
+    paths:
+      - "cluster-autoscaler/ca.tag"
+      - "cluster-autoscaler/ca.patch"
+      - "cluster-autoscaler/Dockerfile"
+      - ".github/workflows/check-ca-builds.yaml"
+  push:
+    branches:
+      - main
+    paths:
+      - "cluster-autoscaler/ca.tag"
+      - "cluster-autoscaler/ca.patch"
+      - "cluster-autoscaler/Dockerfile"
+      - ".github/workflows/check-ca-builds.yaml"
 
 jobs:
   build-ca:
-    runs-on: [ self-hosted, gen3, small ]
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [ amd64, arm64 ]
+    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', matrix.arch == 'arm64' && 'large-arm64' || 'large')) }}
     steps:
       - uses: actions/checkout@v4
 
@@ -41,8 +45,9 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: cluster-autoscaler
-          platforms: linux/amd64
+          platforms: ${{format('linux/{0}', matrix.arch)}}
           push: false
+          target: ${{format('cluster_autoscaler_{0}', matrix.arch)}}
           file: cluster-autoscaler/Dockerfile
           cache-from: type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache
           build-args: |

diff --git a/cluster-autoscaler/Dockerfile b/cluster-autoscaler/Dockerfile
@@ -28,7 +28,15 @@ RUN cd autoscaler/cluster-autoscaler \
 # This is adapted from CA's Dockerfile.amd64, here:
 # https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-1.24.1/cluster-autoscaler/Dockerfile.amd64
 
-FROM gcr.io/distroless/static:nonroot-amd64
+
+# NB: two build stages, one for each architecture, because I wasn't able to use variable substitution in FROM statements
+FROM gcr.io/distroless/static:nonroot-amd64 as cluster_autoscaler_amd64
+
+WORKDIR /
+COPY --from=builder /workspace/cluster-autoscaler .
+CMD ["/cluster-autoscaler"]
+
+FROM gcr.io/distroless/static:nonroot-arm64 as cluster_autoscaler_arm64
 
 WORKDIR /
 COPY --from=builder /workspace/cluster-autoscaler .