From da7a6722a1b470320f4b43ed11ec7bf0fd5c219b Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Fri, 17 May 2024 08:58:22 -0600 Subject: [PATCH] Good update --- common/acm/templates/policies/application-policies.yaml | 4 ++-- common/clustergroup/templates/plumbing/applications.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/acm/templates/policies/application-policies.yaml b/common/acm/templates/policies/application-policies.yaml index 131e8278b..686b9bc0a 100644 --- a/common/acm/templates/policies/application-policies.yaml +++ b/common/acm/templates/policies/application-policies.yaml @@ -43,6 +43,8 @@ spec: path: {{ default "common/clustergroup" .path }} helm: ignoreMissingValueFiles: true + values: | + extraParametersNested: {{ $.Values.extraParametersNested }} valueFiles: {{- include "acm.app.policies.valuefiles" . | nindent 22 }} {{- range $valueFile := .extraValueFiles }} @@ -77,8 +79,6 @@ spec: - name: {{ $k }} value: {{ printf "%s" $v | quote }} {{- end }} - - name: extraParametersNested - value: {{ $.Values.extraParametersNested }} {{- range .helmOverrides }} - name: {{ .name }} value: {{ .value | quote }} diff --git a/common/clustergroup/templates/plumbing/applications.yaml b/common/clustergroup/templates/plumbing/applications.yaml index 44de10ae6..cc4516e92 100644 --- a/common/clustergroup/templates/plumbing/applications.yaml +++ b/common/clustergroup/templates/plumbing/applications.yaml @@ -149,6 +149,8 @@ spec: {{- else }} helm: ignoreMissingValueFiles: true + values: | + extraParametersNested: {{ $.Values.extraParametersNested }} valueFiles: {{- include "clustergroup.app.globalvalues.prefixedvaluefiles" $ | nindent 8 }} {{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }} @@ -187,8 +189,6 @@ spec: - name: {{ $k }} value: {{ printf "%s" $v | quote }} {{- end }} - - name: extraParametersNested - value: {{ $.Values.extraParametersNested }} {{- range .overrides }} - name: {{ .name }} value: {{ .value | quote }} @@ -218,6 +218,8 @@ spec: {{- else if not .kustomize }} helm: ignoreMissingValueFiles: true + values: | + extraParametersNested: {{ $.Values.extraParametersNested }} valueFiles: {{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 6 }} {{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }} @@ -256,8 +258,6 @@ spec: - name: {{ $k }} value: {{ printf "%s" $v | quote }} {{- end }} - - name: extraParametersNested - value: {{ $.Values.extraParametersNested }} {{- range .overrides }} - name: {{ .name }} value: {{ .value | quote }}