From a35d9c410ae6c03bbeca1399552660b3c45033e5 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 5 Nov 2025 16:19:44 +0100 Subject: [PATCH 1/2] Fix clustergroup spoke values files We also need to put it in the multisource values function, which we mistakenly omitted in the previous commit. --- templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index bc11539..ee4605e 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -20,7 +20,7 @@ Default always defined valueFiles to be included when pushing the cluster wide a - '$patternref/values-{{ `{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}` }}-{{ .name }}.yaml' # We cannot use $.Values.global.clusterVersion because that gets resolved to the # hub's cluster version, whereas we want to include the spoke cluster version -- '$patternref/values-{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}.yaml' +- '$patternref/values-{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}-{{ .name }}.yaml' {{- end }} {{- /*acm.app.policies.multisourcevaluefiles */}} {{- define "acm.app.policies.helmparameters" -}} From f948439c1f3d721d946f300875bd71bb37c95b7b Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 5 Nov 2025 16:32:43 +0100 Subject: [PATCH 2/2] Release 0.1.12 --- Chart.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index bb5c951..435c4fa 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,4 +3,4 @@ description: A Helm chart to configure Advanced Cluster Manager for OpenShift. keywords: - pattern name: acm -version: 0.1.11 +version: 0.1.12 diff --git a/README.md b/README.md index a00d7f9..82ec66d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acm -![Version: 0.1.11](https://img.shields.io/badge/Version-0.1.11-informational?style=flat-square) +![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-informational?style=flat-square) A Helm chart to configure Advanced Cluster Manager for OpenShift.