From e9be640920a6fd3aa5426bd73e7e9ce2f4be63cf Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 4 Nov 2025 16:36:02 +0100 Subject: [PATCH 1/2] Fix values files on the spokes On the hub we have: - $patternref/values-global.yaml - $patternref/values-hub.yaml - $patternref/values-AWS.yaml - $patternref/values-AWS-4.20.yaml - $patternref/values-AWS-hub.yaml - $patternref/values-4.20-hub.yaml - $patternref/values-mcg-hub.yaml On the spoke we currently have: - $patternref/values-global.yaml - $patternref/values-group-one.yaml - $patternref/values-AWS.yaml - $patternref/values-AWS-4.20.yaml - $patternref/values-AWS-group-one.yaml - $patternref/values-4.20.yaml The last one should be: - $patternref/values-4.20-group-one.yaml --- templates/_helpers.tpl | 2 +- templates/policies/application-policies.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 829fc3d..bc11539 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -9,7 +9,7 @@ Default always defined valueFiles to be included when pushing the cluster wide a - '/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 -- '/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' +- '/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.valuefiles */}} {{- define "acm.app.policies.multisourcevaluefiles" -}} diff --git a/templates/policies/application-policies.yaml b/templates/policies/application-policies.yaml index eeb34bf..4a7ef22 100644 --- a/templates/policies/application-policies.yaml +++ b/templates/policies/application-policies.yaml @@ -74,7 +74,6 @@ spec: path: {{ .path }} {{- end }} {{- end }} - {{- else }} source: repoURL: {{ coalesce .repoURL $.Values.global.repoURL }} From b58057c567fa2024abfd74ca6bcf958969510733 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 4 Nov 2025 17:02:01 +0100 Subject: [PATCH 2/2] Release acm-chart 0.1.11 --- Chart.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 0dabd3b..bb5c951 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.10 +version: 0.1.11 diff --git a/README.md b/README.md index e8a904f..a00d7f9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acm -![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) +![Version: 0.1.11](https://img.shields.io/badge/Version-0.1.11-informational?style=flat-square) A Helm chart to configure Advanced Cluster Manager for OpenShift.