fix: merge operator values

MapColonies · Feb 6, 2024 · 6822a4a · 6822a4a
1 parent 238e938
commit 6822a4a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/helm/templates/_tplValues.tpl b/helm/templates/_tplValues.tpl
@@ -46,21 +46,21 @@ Custom definitions
 */}}
 
 {{- define "common.storage.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.global.storage .Values.storage ) "context" . ) }}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.storage .Values.global.storage ) "context" . ) }}
 {{- end -}}
 
 {{- define "common.fs.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.global.storage.fs .Values.storage.fs ) "context" . ) }}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.storage.fs .Values.global.storage.fs ) "context" . ) }}
 {{- end -}}
 
 {{- define "common.serviceUrls.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.global.serviceUrls .Values.serviceUrls ) "context" . ) }}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceUrls .Values.global.serviceUrls ) "context" . ) }}
 {{- end -}}
 
 {{- define "common.jobManagement.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.global.jobManagement .Values.jobManagement ) "context" . ) }}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.jobManagement .Values.global.jobManagement ) "context" . ) }}
 {{- end -}}
 
 {{- define "common.ingestion.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.global.ingestion .Values.ingestion ) "context" . ) }}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.ingestion .Values.global.ingestion ) "context" . ) }}
 {{- end -}}