Merge branch 'main' into mandatory-and-supported-IaaS-services

Author: josephineSei

Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/Dockerfile

@@ -1,12 +1,19 @@
 FROM golang:1.23
 
-# Install kubectl
-# Note: Latest version may be found on:
-# https://aur.archlinux.org/packages/kubectl-bin/
-RUN wget https://storage.googleapis.com/kubernetes-release/release/v1.21.3/bin/linux/amd64/kubectl -O /usr/bin/kubectl && \
-    chmod +x /usr/bin/kubectl && \
-    apt-get update && \
-    apt-get install -y jq
+# Use build arguments to get the correct architecture
+ARG TARGETARCH
+
+# Install kubectl based on the architecture
+#See https://github.com/kubernetes-sigs/kubespray/pull/10066
+RUN apt-get update && apt-get install -y wget jq && \
+    if [ "$TARGETARCH" = "amd64" ]; then \
+        wget https://cdn.dl.k8s.io/release/v1.31.1/bin/linux/amd64/kubectl -O /usr/bin/kubectl; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+        wget https://cdn.dl.k8s.io/release/v1.31.1/bin/linux/arm64/kubectl -O /usr/bin/kubectl; \
+    else \
+        echo "Unsupported architecture: $TARGETARCH" && exit 1; \
+    fi && \
+    chmod +x /usr/bin/kubectl
 
 COPY ./scs_k8s_tests /src/scs_k8s_tests
 WORKDIR /src
@@ -19,5 +26,3 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     go test -c -o custom.test ./...
 
 CMD ["bash", "-c", "go tool test2json ./custom.test -test.v"]
-
-

Tests/kaas/kaas-sonobuoy-go-example-e2e-framework/Makefile

@@ -57,6 +57,7 @@ dev-prerequests:
 	@docker version
 	@sonobuoy version --short
 	@go version
+	@docker buildx version
 
 
 dev-setup: kind-init