Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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/{{ . }}"
Expand Down
4 changes: 2 additions & 2 deletions tests/application_multi_source_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ tests:
value: acm
lengthEqual:
path: spec.sources[1].helm.parameters
count: 16
count: 17
- documentSelector:
path: metadata.name
value: vault
Expand Down Expand Up @@ -96,4 +96,4 @@ tests:
value: acm
lengthEqual:
path: spec.sources[1].helm.parameters
count: 18
count: 19
4 changes: 2 additions & 2 deletions values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down