[VDEVOPS-613]: ARM runners support

Signed-off-by: adobrodey <[email protected]>
next-gen-infrastructure · May 31, 2024 · 388b42d · 388b42d
1 parent edcd586
commit 388b42d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/deploy-gh-actions.yaml b/.github/workflows/deploy-gh-actions.yaml
@@ -31,4 +31,5 @@ jobs:
         with:
           context: ./gh-actions/actions-runner-dind
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/actions-runner-dind:latest
diff --git a/gh-actions/actions-runner-dind/Dockerfile b/gh-actions/actions-runner-dind/Dockerfile
@@ -2,9 +2,10 @@ FROM ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner-
 
 USER root
 
-ARG AWS_CLI_VERSION=2.15.28
+ARG AWS_CLI_VERSION=2.15.61
 RUN \
-  curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip" \
+  if [ "${TARGETARCH}" = "arm64" ]; then export TARGETARCH="aarch64"; else export TARGETARCH="x86_64"; fi \
+  && curl "https://awscli.amazonaws.com/awscli-exe-linux-${TARGETARCH}-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip" \
   && unzip awscliv2.zip \
   && ./aws/install \
   && rm -rf \
@@ -16,7 +17,7 @@ RUN \
 
 ARG KUBECTL_VERSION=1.29.2
 RUN \
-    curl -LO "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
+    curl -LO "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl" \
     && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
 USER runner