From c2ffaf35dacf761df92ec14bd22e872ed22c175a Mon Sep 17 00:00:00 2001 From: Maximilian Techritz Date: Wed, 8 Oct 2025 10:30:27 +0200 Subject: [PATCH 1/5] fix(helm): `image.repository` location --- charts/metrics-operator/values.yaml | 2 +- charts/metrics-operator/values.yaml.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/metrics-operator/values.yaml b/charts/metrics-operator/values.yaml index 6fa260e..3651586 100644 --- a/charts/metrics-operator/values.yaml +++ b/charts/metrics-operator/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: ghcr.io/openmcp-project/github.com/openmcp-project/metrics-operator/images/metrics-operator + repository: ghcr.io/openmcp-project/images/metrics-operator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: v0.7.0 diff --git a/charts/metrics-operator/values.yaml.tpl b/charts/metrics-operator/values.yaml.tpl index e2a7f54..4da530a 100644 --- a/charts/metrics-operator/values.yaml.tpl +++ b/charts/metrics-operator/values.yaml.tpl @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: ghcr.io/openmcp-project/github.com/openmcp-project/metrics-operator/images/metrics-operator + repository: ghcr.io/openmcp-project/images/metrics-operator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: $OPERATOR_VERSION From 5e28b2232916790abd4b8658fffbdad647f2a33a Mon Sep 17 00:00:00 2001 From: Maximilian Techritz Date: Wed, 8 Oct 2025 10:34:28 +0200 Subject: [PATCH 2/5] fix: Dockerfile to support multiarch images --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8392c98..62240bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static:nonroot +FROM gcr.io/distroless/static:nonroot@sha256:627d6c5a23ad24e6bdff827f16c7b60e0289029b0c79e9f7ccd54ae3279fb45f +ARG TARGETARCH WORKDIR / -COPY bin/manager-linux.amd64 /manager +COPY bin/manager-linux.${TARGETARCH} /manager USER 65532:65532 -ENTRYPOINT ["/manager"] +ENTRYPOINT ["/manager"] \ No newline at end of file From 91bd74ffbd299558dc3f8a1d910d59bd407af433 Mon Sep 17 00:00:00 2001 From: Maximilian Techritz Date: Wed, 8 Oct 2025 10:34:58 +0200 Subject: [PATCH 3/5] fix: component-constructor to suppport multiarch images --- component-constructor.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/component-constructor.yaml b/component-constructor.yaml index 0aa62ea..cd49fcc 100644 --- a/component-constructor.yaml +++ b/component-constructor.yaml @@ -10,11 +10,12 @@ components: type: helm path: ./charts/${COMPONENT_NAME} repository: charts/${COMPONENT_NAME} - + - name: ${COMPONENT_NAME}-image type: ociImage input: type: dockermulti repository: images/${COMPONENT_NAME} variants: - - "${COMPONENT_REPO_PREFIX}:${VERSION}" \ No newline at end of file + - "${COMPONENT_REPO_PREFIX}:${VERSION}-linux-amd64" + - "${COMPONENT_REPO_PREFIX}:${VERSION}-linux-arm64" From 6651704af4ad8255ce30a6d3bbfaabeac695871b Mon Sep 17 00:00:00 2001 From: Maximilian Techritz Date: Wed, 8 Oct 2025 10:35:29 +0200 Subject: [PATCH 4/5] feat: release v0.7.1 --- VERSION | 2 +- charts/metrics-operator/Chart.yaml | 4 ++-- charts/metrics-operator/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index f7fbf5e..6425bba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.7.0-dev \ No newline at end of file +v0.7.1 \ No newline at end of file diff --git a/charts/metrics-operator/Chart.yaml b/charts/metrics-operator/Chart.yaml index b879a20..6cb6222 100644 --- a/charts/metrics-operator/Chart.yaml +++ b/charts/metrics-operator/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: metrics-operator description: A Helm chart for the metrics-operator type: application -version: v0.7.0 -appVersion: v0.7.0 +version: v0.7.1 +appVersion: v0.7.1 diff --git a/charts/metrics-operator/values.yaml b/charts/metrics-operator/values.yaml index 3651586..b8f34df 100644 --- a/charts/metrics-operator/values.yaml +++ b/charts/metrics-operator/values.yaml @@ -8,7 +8,7 @@ image: repository: ghcr.io/openmcp-project/images/metrics-operator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v0.7.0 + tag: v0.7.1 imagePullSecrets: [] nameOverride: "" From bd4181f9d930209f45116c36329f5a8e7b3cd7ef Mon Sep 17 00:00:00 2001 From: Maximilian Techritz Date: Wed, 8 Oct 2025 10:47:21 +0200 Subject: [PATCH 5/5] chore(#85): update distroless/static dependency --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62240bf..a3dcb02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static:nonroot@sha256:627d6c5a23ad24e6bdff827f16c7b60e0289029b0c79e9f7ccd54ae3279fb45f +FROM gcr.io/distroless/static:nonroot@sha256:e8a4044e0b4ae4257efa45fc026c0bc30ad320d43bd4c1a7d5271bd241e386d0 ARG TARGETARCH WORKDIR / COPY bin/manager-linux.${TARGETARCH} /manager