From d3ab053b0cede9f67ff18940916d9858a581d763 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Thu, 12 Feb 2026 09:31:34 +0100 Subject: [PATCH 1/2] Fix default image in values.schema.json --- values.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values.schema.json b/values.schema.json index ba2ea16..1108fcb 100644 --- a/values.schema.json +++ b/values.schema.json @@ -770,7 +770,7 @@ }, "image": { "type": "string", - "default": "registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8:latest" + "default": "quay.io/validatedpatterns/imperative-container:v1" }, "namespace": { "type": "string", @@ -868,7 +868,7 @@ }, "image": { "type": "string", - "default": "registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8:latest" + "default": "quay.io/validatedpatterns/imperative-container:v1" }, "tags": { "type": "string" From 73801f33051b6acb199581ea4d747c826941063f Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Thu, 12 Feb 2026 09:53:10 +0100 Subject: [PATCH 2/2] add global.localClusterName This is currently already set by the pattern operator in the clusterwide argo app and by the acm chart in the spoke cluster wide argo app, what is missing is bringing it to the namespaced argo app. Tested on mcg and now all namespaced argo applications correctly have this variable. --- templates/_helpers.tpl | 8 ++++++++ tests/application_multi_source_test.yaml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 555802c..a33abc1 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -14,6 +14,8 @@ Default always defined top-level variables for helm charts value: {{ $.Values.global.pattern }} - name: global.clusterDomain value: {{ $.Values.global.clusterDomain }} +- name: global.localClusterName + value: {{ $.Values.global.localClusterName }} - name: global.clusterVersion value: "{{ $.Values.global.clusterVersion }}" - name: global.clusterPlatform @@ -54,6 +56,9 @@ Default always defined valueFiles to be included in Applications {{- if $.Values.global.clusterVersion }} - "/values-{{ $.Values.global.clusterVersion }}-{{ $.Values.clusterGroup.name }}.yaml" {{- end }} +{{- if $.Values.global.localClusterName }} +- "/values-{{ $.Values.global.localClusterName }}.yaml" +{{- end }} {{- if $.Values.global.extraValueFiles }} {{- range $.Values.global.extraValueFiles }} - {{ . | quote }} @@ -103,6 +108,9 @@ Default always defined valueFiles to be included in Applications but with a pref {{- if $.Values.global.clusterVersion }} - "$patternref/values-{{ $.Values.global.clusterVersion }}-{{ $.Values.clusterGroup.name }}.yaml" {{- end }} +{{- if $.Values.global.localClusterName }} +- "$patternref/values-{{ $.Values.global.localClusterName }}.yaml" +{{- end }} {{- if $.Values.global.extraValueFiles }} {{- range $.Values.global.extraValueFiles }} - "$patternref/{{ . }}" diff --git a/tests/application_multi_source_test.yaml b/tests/application_multi_source_test.yaml index 3b2d009..434bd7f 100644 --- a/tests/application_multi_source_test.yaml +++ b/tests/application_multi_source_test.yaml @@ -62,7 +62,7 @@ tests: value: acm lengthEqual: path: spec.sources[1].helm.parameters - count: 16 + count: 17 - documentSelector: path: metadata.name value: vault @@ -96,4 +96,4 @@ tests: value: acm lengthEqual: path: spec.sources[1].helm.parameters - count: 18 + count: 19