feat: Add support for extra containers in server & controller deployment

Signed-off-by: Mike Bryant <mikebryant@bulb.co.uk>
This commit is contained in:
Mike Bryant 2021-07-20 14:37:27 +01:00
parent 1e3a4afd05
commit 2020aafb62
4 changed files with 12 additions and 2 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v2
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.2.7 version: 0.3.0
appVersion: "v3.0.7" appVersion: "v3.0.7"
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
@ -15,4 +15,4 @@ maintainers:
- name: benjaminws - name: benjaminws
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Added]: Initialize Changelog" - "[Added]: Support for extraContainers in controller/server"

View file

@ -79,6 +79,9 @@ spec:
containerPort: {{ .Values.controller.metricsConfig.port }} containerPort: {{ .Values.controller.metricsConfig.port }}
- containerPort: 6060 - containerPort: 6060
livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }} livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }}
{{- if .Values.controller.extraContainers }}
{{ toYaml .Values.controller.extraContainers | nindent 8}}
{{- end }}
{{- with .Values.images.pullSecrets }} {{- with .Values.images.pullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -80,6 +80,9 @@ spec:
{{- with .Values.server.volumeMounts }} {{- with .Values.server.volumeMounts }}
{{- toYaml . | nindent 10}} {{- toYaml . | nindent 10}}
{{- end }} {{- end }}
{{- if .Values.server.extraContainers }}
{{ toYaml .Values.server.extraContainers | nindent 8}}
{{- end }}
{{- with .Values.images.pullSecrets }} {{- with .Values.images.pullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -171,6 +171,8 @@ controller:
clusterWorkflowTemplates: clusterWorkflowTemplates:
# Create a ClusterRole and CRB for the controller to access ClusterWorkflowTemplates. # Create a ClusterRole and CRB for the controller to access ClusterWorkflowTemplates.
enabled: true enabled: true
# Extra containers to be added to the controller deployment
extraContainers: []
# executor controls how the init and wait container should be customized # executor controls how the init and wait container should be customized
executor: executor:
@ -337,6 +339,8 @@ server:
## decisions. ## decisions.
# scopes: # scopes:
# - groups # - groups
# Extra containers to be added to the server deployment
extraContainers: []
# Influences the creation of the ConfigMap for the workflow-controller itself. # Influences the creation of the ConfigMap for the workflow-controller itself.
useDefaultArtifactRepo: false useDefaultArtifactRepo: false