[bitnami/argo-workflows: Use merge helper]: (#19023)

This commit is contained in:
Juan Ariza Toledano
2023-09-07 12:26:17 +02:00
committed by GitHub
parent 335cb272ef
commit c7cda666b9
12 changed files with 39 additions and 39 deletions

View File

@@ -12,7 +12,7 @@ metadata:
app.kubernetes.io/part-of: argo-workflows
app.kubernetes.io/component: server
{{- if or .Values.server.service.annotations .Values.commonAnnotations }}
{{- $annotations := merge .Values.server.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.server.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@@ -41,6 +41,6 @@ spec:
{{- if .Values.server.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.server.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.server.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: server