Build the test image in a way that works for both platform types (#448)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

charts/k8s-monitoring/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: k8s-monitoring
 description: A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
 type: application
-version: 0.13.1
+version: 0.13.2
 appVersion: 2.1.3
 icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
 sources:

charts/k8s-monitoring/Makefile

@@ -68,7 +68,7 @@ docs/RBAC.md: ../../examples/default-values/output.yaml ../../examples/openshift
 	echo '```' >> docs/RBAC.md
 
 build-image: test/Dockerfile test/config-analysis.sh test/query-test.sh
-	docker build --tag ghcr.io/grafana/k8s-monitoring-test:$(shell yq -r '.version' Chart.yaml) test
+	docker build --platform linux/amd64 --tag ghcr.io/grafana/k8s-monitoring-test:$(shell yq -r '.version' Chart.yaml) test
 
 push-image:
 	docker push ghcr.io/grafana/k8s-monitoring-test:$(shell yq -r '.version' Chart.yaml)

charts/k8s-monitoring/README.md

@@ -3,7 +3,7 @@
 
 # k8s-monitoring
 
-![Version: 0.13.1](https://img.shields.io/badge/Version-0.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.3](https://img.shields.io/badge/AppVersion-2.1.3-informational?style=flat-square)
+![Version: 0.13.2](https://img.shields.io/badge/Version-0.13.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.3](https://img.shields.io/badge/AppVersion-2.1.3-informational?style=flat-square)
 
 A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
 

charts/k8s-monitoring/test/Dockerfile

@@ -1,9 +1,14 @@
 FROM quay.io/curl/curl:latest AS profilecli-downloader
+ARG PROFILECLI_VERSION=1.5.0
+ARG TARGETARCH
+
 # Download profilecli for Pyroscope queries
-RUN curl -fL https://github.com/grafana/pyroscope/releases/download/v1.5.0/profilecli_1.5.0_linux_amd64.tar.gz | tar xvz && \
+RUN curl -fL https://github.com/grafana/pyroscope/releases/download/v${PROFILECLI_VERSION}/profilecli_${PROFILECLI_VERSION}_linux_${TARGETARCH}.tar.gz | tar xvz && \
     chmod +x profilecli
 
-FROM nixery.dev/shell/bc/curl/jq
+FROM nixery.dev/shell/bc/curl/jq/file AS base-image-amd64
+FROM nixery.dev/arm64/shell/bc/curl/jq/file AS base-image-arm64
 
+FROM base-image-${TARGETARCH} AS final
 COPY --from=profilecli-downloader /home/curl_user/profilecli /usr/local/bin/profilecli
 COPY ["config-analysis.sh", "query-test.sh", "/etc/bin/"]