DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

argo-events: Evaluating image values with tpl

Browse source 
We need to evaluate the image values to allow the use of external
values.

Related to argoproj/argo-helm#2305

Signed-off-by: David Vallee Delisle <me@dvd.dev>
This commit is contained in:
David Vallee Delisle 2023-12-26 10:53:35 -05:00
parent 410e73af93
commit 2fc0fb7e8b
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
charts/argo-events/templates/argo-events-controller/config.yaml
View file

@ -13,8 +13,8 @@ data:
versions: versions:
{{- range .Values.configs.nats.versions }} {{- range .Values.configs.nats.versions }}
- version: {{ .version }} - version: {{ .version }}
natsStreamingImage: {{ .natsStreamingImage }} natsStreamingImage: {{ tpl .natsStreamingImage $ }}
metricsExporterImage: {{ .metricsExporterImage }} metricsExporterImage: {{ tpl .metricsExporterImage $ }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.configs.jetstream.versions }} {{- if .Values.configs.jetstream.versions }}
@ -35,9 +35,9 @@ data:
versions: versions:
{{- range .Values.configs.jetstream.versions }} {{- range .Values.configs.jetstream.versions }}
- version: {{ .version }} - version: {{ .version }}
natsImage: {{ .natsImage }} natsImage: {{ tpl .natsImage $ }}
metricsExporterImage: {{ .metricsExporterImage }} metricsExporterImage: {{ tpl .metricsExporterImage $ }}
configReloaderImage: {{ .configReloaderImage }} configReloaderImage: {{ tpl .configReloaderImage $ }}
startCommand: {{ .startCommand }} startCommand: {{ .startCommand }}
{{- end }} {{- end }}
{{- end }} {{- end }}

6
charts/argo-events/templates/argo-events-controller/deployment.yaml
View file

@ -41,8 +41,8 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Values.controller.name }} - name: {{ .Values.controller.name }}
image: {{ default .Values.global.image.repository .Values.controller.image.repository }}:{{ default (include "argo-events.defaultTag" .) .Values.controller.image.tag }} image: {{ tpl (default .Values.global.image.repository .Values.controller.image.repository) . }}:{{ tpl (default (include "argo-events.defaultTag" .) .Values.controller.image.tag) . }}
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }} imagePullPolicy: {{ tpl (default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy) . }}
args: args:
- controller - controller
{{- if .Values.controller.rbac.namespaced }} {{- if .Values.controller.rbac.namespaced }}
@ -58,7 +58,7 @@ spec:
{{- end }} {{- end }}
env: env:
- name: ARGO_EVENTS_IMAGE - name: ARGO_EVENTS_IMAGE
value: {{ default .Values.global.image.repository .Values.controller.image.repository }}:{{ default (include "argo-events.defaultTag" .) .Values.controller.image.tag }} value: {{ tpl (default .Values.global.image.repository .Values.controller.image.repository) . }}:{{ tpl (default (include "argo-events.defaultTag" .) .Values.controller.image.tag) . }}
- name: NAMESPACE - name: NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:

4
charts/argo-events/templates/argo-events-webhook/deployment.yaml
View file

@ -41,8 +41,8 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Values.webhook.name }} - name: {{ .Values.webhook.name }}
image: {{ default .Values.global.image.repository .Values.webhook.image.repository }}:{{ default (include "argo-events.defaultTag" .) .Values.webhook.image.tag }} image: {{ tpl (default .Values.global.image.repository .Values.webhook.image.repository) . }}:{{ tpl (default (include "argo-events.defaultTag" .) .Values.webhook.image.tag) . }}
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.webhook.image.imagePullPolicy }} imagePullPolicy: {{ tpl (default .Values.global.image.imagePullPolicy .Values.webhook.image.imagePullPolicy) . }}
args: args:
- webhook-service - webhook-service
{{- with .Values.webhook.containerSecurityContext }} {{- with .Values.webhook.containerSecurityContext }}