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

feat(argo-workflows): add envFrom for main container (#1736)

Browse source 
Signed-off-by: huiwq1990 <huiwq1990@163.com>

Signed-off-by: huiwq1990 <huiwq1990@163.com>
This commit is contained in:
huiwq1990 2022-12-30 13:20:47 +08:00 committed by GitHub
parent daba66b68c
commit 5bd70fbd24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-workflows/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v3.4.4
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.22.5 version: 0.22.6
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
sources: sources:
@ -13,4 +13,4 @@ maintainers:
url: https://argoproj.github.io/ url: https://argoproj.github.io/
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Removed]: legacy API versions for PDBs" - "[Added]: Suuport envFrom for main container"

1
charts/argo-workflows/README.md
View file

@ -153,6 +153,7 @@ Fields to note:
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| mainContainer.env | list | `[]` | Adds environment variables for the Workflow main container | | mainContainer.env | list | `[]` | Adds environment variables for the Workflow main container |
| mainContainer.envFrom | list | `[]` | Adds reference environment variables for the Workflow main container |
| mainContainer.imagePullPolicy | string | `""` | imagePullPolicy to apply to Workflow main container. Defaults to `.Values.images.pullPolicy`. | | mainContainer.imagePullPolicy | string | `""` | imagePullPolicy to apply to Workflow main container. Defaults to `.Values.images.pullPolicy`. |
| mainContainer.resources | object | `{}` | Resource limits and requests for the Workflow main container | | mainContainer.resources | object | `{}` | Resource limits and requests for the Workflow main container |
| mainContainer.securityContext | object | `{}` | sets security context for the Workflow main container | | mainContainer.securityContext | object | `{}` | sets security context for the Workflow main container |

5
charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
View file

@ -25,7 +25,7 @@ data:
{{- with .Values.controller.initialDelay }} {{- with .Values.controller.initialDelay }}
initialDelay: {{ . }} initialDelay: {{ . }}
{{- end }} {{- end }}
{{- if or .Values.mainContainer.resources .Values.mainContainer.env .Values.mainContainer.securityContext}} {{- if or .Values.mainContainer.resources .Values.mainContainer.env .Values.mainContainer.envFrom .Values.mainContainer.securityContext}}
mainContainer: mainContainer:
imagePullPolicy: {{ default (.Values.images.pullPolicy) .Values.mainContainer.imagePullPolicy }} imagePullPolicy: {{ default (.Values.images.pullPolicy) .Values.mainContainer.imagePullPolicy }}
{{- with .Values.mainContainer.resources }} {{- with .Values.mainContainer.resources }}
@ -34,6 +34,9 @@ data:
{{- with .Values.mainContainer.env }} {{- with .Values.mainContainer.env }}
env: {{- toYaml . | nindent 8 }} env: {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.mainContainer.envFrom }}
envFrom: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.mainContainer.securityContext }} {{- with .Values.mainContainer.securityContext }}
securityContext: {{- toYaml . | nindent 8 }} securityContext: {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}

2
charts/argo-workflows/values.yaml
View file

@ -324,6 +324,8 @@ mainContainer:
resources: {} resources: {}
# -- Adds environment variables for the Workflow main container # -- Adds environment variables for the Workflow main container
env: [] env: []
# -- Adds reference environment variables for the Workflow main container
envFrom: []
# -- sets security context for the Workflow main container # -- sets security context for the Workflow main container
securityContext: {} securityContext: {}