Skip to content

Commit e1a448d

Browse files
mbaldessarimbaldessari
authored
Merge pull request #516 from claudiol/extra-nested-params-updates
Feat: Followup to definition of extraParameters under the main section of a values file.
2 parents 2638c41 + 4eeb69b commit e1a448d

9 files changed

Lines changed: 73 additions & 0 deletions

‎acm/templates/policies/application-policies.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ spec:
4343
path: {{ default "common/clustergroup" .path }}
4444
helm:
4545
ignoreMissingValueFiles: true
46+
values: |
47+
extraParametersNested:
48+
{{- range $k, $v := $.Values.extraParametersNested }}
49+
{{ $k }}: {{ printf "%s" $v | quote }}
50+
{{- end }}
4651
valueFiles:
4752
{{- include "acm.app.policies.valuefiles" . | nindent 22 }}
4853
{{- range $valueFile := .extraValueFiles }}
@@ -73,6 +78,10 @@ spec:
7378
value: {{ $group.name }}
7479
- name: global.experimentalCapabilities
7580
value: {{ $.Values.global.experimentalCapabilities }}
81+
{{- range $k, $v := $.Values.extraParametersNested }}
82+
- name: {{ $k }}
83+
value: {{ printf "%s" $v | quote }}
84+
{{- end }}
7685
{{- range .helmOverrides }}
7786
- name: {{ .name }}
7887
value: {{ .value | quote }}

‎clustergroup/templates/plumbing/applications.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@ spec:
149149
{{- else }}
150150
helm:
151151
ignoreMissingValueFiles: true
152+
values: |
153+
extraParametersNested:
154+
{{- range $k, $v := $.Values.extraParametersNested }}
155+
{{ $k }}: {{ printf "%s" $v | quote }}
156+
{{- end }}
152157
valueFiles:
153158
{{- include "clustergroup.app.globalvalues.prefixedvaluefiles" $ | nindent 8 }}
154159
{{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }}
@@ -216,6 +221,11 @@ spec:
216221
{{- else if not .kustomize }}
217222
helm:
218223
ignoreMissingValueFiles: true
224+
values: |
225+
extraParametersNested:
226+
{{- range $k, $v := $.Values.extraParametersNested }}
227+
{{ $k }}: {{ printf "%s" $v | quote }}
228+
{{- end }}
219229
valueFiles:
220230
{{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 6 }}
221231
{{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }}

‎tests/acm-industrial-edge-hub.expected.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ spec:
214214
path: common/clustergroup
215215
helm:
216216
ignoreMissingValueFiles: true
217+
values: |
218+
extraParametersNested:
217219
valueFiles:
218220
- "/values-global.yaml"
219221
- "/values-factory.yaml"

‎tests/acm-medical-diagnosis-hub.expected.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ spec:
205205
path: common/clustergroup
206206
helm:
207207
ignoreMissingValueFiles: true
208+
values: |
209+
extraParametersNested:
208210
valueFiles:
209211
- "/values-global.yaml"
210212
- "/values-region-one.yaml"

‎tests/acm-normal.expected.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ spec:
608608
path: common/clustergroup
609609
helm:
610610
ignoreMissingValueFiles: true
611+
values: |
612+
extraParametersNested:
611613
valueFiles:
612614
- "/values-global.yaml"
613615
- "/values-acm-edge.yaml"
@@ -704,6 +706,8 @@ spec:
704706
path: common/clustergroup
705707
helm:
706708
ignoreMissingValueFiles: true
709+
values: |
710+
extraParametersNested:
707711
valueFiles:
708712
- "/values-global.yaml"
709713
- "/values-acm-provision-edge.yaml"

‎tests/clustergroup-industrial-edge-factory.expected.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@ spec:
559559
path: charts/datacenter/opendatahub
560560
helm:
561561
ignoreMissingValueFiles: true
562+
values: |
563+
extraParametersNested:
562564
valueFiles:
563565
- "/values-global.yaml"
564566
- "/values-factory.yaml"

‎tests/clustergroup-industrial-edge-hub.expected.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,8 @@ spec:
857857
path: common/acm
858858
helm:
859859
ignoreMissingValueFiles: true
860+
values: |
861+
extraParametersNested:
860862
valueFiles:
861863
- "/values-global.yaml"
862864
- "/values-datacenter.yaml"
@@ -922,6 +924,8 @@ spec:
922924
path: charts/datacenter/opendatahub
923925
helm:
924926
ignoreMissingValueFiles: true
927+
values: |
928+
extraParametersNested:
925929
valueFiles:
926930
- "/values-global.yaml"
927931
- "/values-datacenter.yaml"
@@ -978,6 +982,8 @@ spec:
978982
path: charts/datacenter/pipelines
979983
helm:
980984
ignoreMissingValueFiles: true
985+
values: |
986+
extraParametersNested:
981987
valueFiles:
982988
- "/values-global.yaml"
983989
- "/values-datacenter.yaml"
@@ -1034,6 +1040,8 @@ spec:
10341040
path: charts/datacenter/manuela-data-lake
10351041
helm:
10361042
ignoreMissingValueFiles: true
1043+
values: |
1044+
extraParametersNested:
10371045
valueFiles:
10381046
- "/values-global.yaml"
10391047
- "/values-datacenter.yaml"
@@ -1120,6 +1128,8 @@ spec:
11201128
path: charts/datacenter/external-secrets
11211129
helm:
11221130
ignoreMissingValueFiles: true
1131+
values: |
1132+
extraParametersNested:
11231133
valueFiles:
11241134
- "/values-global.yaml"
11251135
- "/values-datacenter.yaml"
@@ -1176,6 +1186,8 @@ spec:
11761186
path: common/golang-external-secrets
11771187
helm:
11781188
ignoreMissingValueFiles: true
1189+
values: |
1190+
extraParametersNested:
11791191
valueFiles:
11801192
- "/values-global.yaml"
11811193
- "/values-datacenter.yaml"
@@ -1259,6 +1271,8 @@ spec:
12591271
chart: vault
12601272
helm:
12611273
ignoreMissingValueFiles: true
1274+
values: |
1275+
extraParametersNested:
12621276
valueFiles:
12631277
- "/values-global.yaml"
12641278
- "/values-datacenter.yaml"

‎tests/clustergroup-medical-diagnosis-hub.expected.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ spec:
742742
path: common/golang-external-secrets
743743
helm:
744744
ignoreMissingValueFiles: true
745+
values: |
746+
extraParametersNested:
745747
valueFiles:
746748
- "/values-global.yaml"
747749
- "/values-hub.yaml"
@@ -798,6 +800,8 @@ spec:
798800
path: charts/all/kafdrop
799801
helm:
800802
ignoreMissingValueFiles: true
803+
values: |
804+
extraParametersNested:
801805
valueFiles:
802806
- "/values-global.yaml"
803807
- "/values-hub.yaml"
@@ -854,6 +858,8 @@ spec:
854858
path: charts/all/kafka
855859
helm:
856860
ignoreMissingValueFiles: true
861+
values: |
862+
extraParametersNested:
857863
valueFiles:
858864
- "/values-global.yaml"
859865
- "/values-hub.yaml"
@@ -910,6 +916,8 @@ spec:
910916
path: charts/all/opendatahub
911917
helm:
912918
ignoreMissingValueFiles: true
919+
values: |
920+
extraParametersNested:
913921
valueFiles:
914922
- "/values-global.yaml"
915923
- "/values-hub.yaml"
@@ -966,6 +974,8 @@ spec:
966974
path: charts/all/openshift-data-foundations
967975
helm:
968976
ignoreMissingValueFiles: true
977+
values: |
978+
extraParametersNested:
969979
valueFiles:
970980
- "/values-global.yaml"
971981
- "/values-hub.yaml"
@@ -1022,6 +1032,8 @@ spec:
10221032
path: charts/all/openshift-serverless
10231033
helm:
10241034
ignoreMissingValueFiles: true
1035+
values: |
1036+
extraParametersNested:
10251037
valueFiles:
10261038
- "/values-global.yaml"
10271039
- "/values-hub.yaml"
@@ -1078,6 +1090,8 @@ spec:
10781090
path: charts/all/medical-diagnosis/service-account
10791091
helm:
10801092
ignoreMissingValueFiles: true
1093+
values: |
1094+
extraParametersNested:
10811095
valueFiles:
10821096
- "/values-global.yaml"
10831097
- "/values-hub.yaml"
@@ -1134,6 +1148,8 @@ spec:
11341148
chart: vault
11351149
helm:
11361150
ignoreMissingValueFiles: true
1151+
values: |
1152+
extraParametersNested:
11371153
valueFiles:
11381154
- "/values-global.yaml"
11391155
- "/values-hub.yaml"
@@ -1208,6 +1224,8 @@ spec:
12081224
path: charts/all/medical-diagnosis/database
12091225
helm:
12101226
ignoreMissingValueFiles: true
1227+
values: |
1228+
extraParametersNested:
12111229
valueFiles:
12121230
- "/values-global.yaml"
12131231
- "/values-hub.yaml"
@@ -1264,6 +1282,8 @@ spec:
12641282
path: charts/all/medical-diagnosis/grafana
12651283
helm:
12661284
ignoreMissingValueFiles: true
1285+
values: |
1286+
extraParametersNested:
12671287
valueFiles:
12681288
- "/values-global.yaml"
12691289
- "/values-hub.yaml"
@@ -1320,6 +1340,8 @@ spec:
13201340
path: charts/all/medical-diagnosis/image-generator
13211341
helm:
13221342
ignoreMissingValueFiles: true
1343+
values: |
1344+
extraParametersNested:
13231345
valueFiles:
13241346
- "/values-global.yaml"
13251347
- "/values-hub.yaml"
@@ -1385,6 +1407,8 @@ spec:
13851407
path: charts/all/medical-diagnosis/image-server
13861408
helm:
13871409
ignoreMissingValueFiles: true
1410+
values: |
1411+
extraParametersNested:
13881412
valueFiles:
13891413
- "/values-global.yaml"
13901414
- "/values-hub.yaml"
@@ -1450,6 +1474,8 @@ spec:
14501474
path: charts/all/medical-diagnosis/xray-init
14511475
helm:
14521476
ignoreMissingValueFiles: true
1477+
values: |
1478+
extraParametersNested:
14531479
valueFiles:
14541480
- "/values-global.yaml"
14551481
- "/values-hub.yaml"

‎tests/clustergroup-normal.expected.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,8 @@ spec:
707707
path: common/acm
708708
helm:
709709
ignoreMissingValueFiles: true
710+
values: |
711+
extraParametersNested:
710712
valueFiles:
711713
- "/values-global.yaml"
712714
- "/values-example.yaml"
@@ -774,6 +776,8 @@ spec:
774776
path: charts/datacenter/pipelines
775777
helm:
776778
ignoreMissingValueFiles: true
779+
values: |
780+
extraParametersNested:
777781
valueFiles:
778782
- "/values-global.yaml"
779783
- "/values-example.yaml"

0 commit comments

Comments
 (0)