feat(argo-workflows): Add mainContainer config in configmap (#1310)
* Specify logformat for Argo-CD notifications component (#1303) * Add: Specify logformat for Argo-CD notifications component Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * Update: Chart changelog Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * Fix: documentation Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * feat(argo-rollouts): readonly dashboard (#1304) * feat-argo-rollouts-readonly-dashboard Signed-off-by: foxtel-temujincabigao <86087373+foxtel-temujincabigao@users.noreply.github.com>" Signed-off-by: foxtel-temujincabigao <86087373+foxtel-temujincabigao@users.noreply.github.com> * fixing readme values version link Signed-off-by: foxtel-temujincabigao <86087373+foxtel-temujincabigao@users.noreply.github.com> Signed-off-by: foxtel-temujincabigao <86087373+foxtel-temujincabigao@users.noreply.github.com> Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * fix(argo-workflows): Remove unsupported value (#1302) * fix(argo-workflows): Add comment about removed flag Signed-off-by: yu-croco <yuki.kita22@gmail.com> * fix(argo-workflows): Remove unsupported value Signed-off-by: yu-croco <yuki.kita22@gmail.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add mainContainer config in configmap Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * update version Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add mainContainer to values Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add mainContainer to readme Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add changelog Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add Workflow Main Container key Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * fix(argo-cd): AppSet and Notifications respect global.podAnnotations (#1308) Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * feat(argo-cd): support separate imagePullSecrets (#1311) Signed-off-by: yu-croco <yuki.kita22@gmail.com> Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * chore: Update some tools' version on GitHub Actions (#1312) Signed-off-by: yu-croco <yuki.kita22@gmail.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * chore(CODEOWNERS): Add jmeridth as approver (#1271) Signed-off-by: jmeridth <jmeridth@gmail.com> Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * feat(argo-cd): Support annotations in argocd-configs secrets (#1314) * feat(argo-cd): support annotations in argocd-configs secrets Signed-off-by: yu-croco <yuki.kita22@gmail.com> * fix(argo-cd): align to exitsing format Signed-off-by: yu-croco <yuki.kita22@gmail.com> Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add new line to fix failed liniting Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * remove auto-generating readme Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * match readme as per the comment in values file Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add image pullpolicy to values.yaml Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add image pullpolicy to values.yaml Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * add image pullpolicy to readme Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * fix ordering in readme Signed-off-by: Prateek Khera <mail.prateekkhera@gmail.com> * Exclude "mainContainer" prefix from General parameters Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Co-authored-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> Co-authored-by: foxtel-temujincabigao <86087373+foxtel-temujincabigao@users.noreply.github.com> Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com> Co-authored-by: Aikawa <yuki.kita22@gmail.com> Co-authored-by: Prateek Khera <mail.prateekkhera@gmail.com> Co-authored-by: JM" (Jason Meridth) <jmeridth@gmail.com>pull/1319/head^2 argo-workflows-0.16.3
Prateek Khera
GitHub
parent
1e689a4356
commit
5112c77824
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
name: argo-workflows
|
||||
description: A Helm chart for Argo Workflows
|
||||
type: application
|
||||
version: 0.16.2
|
||||
version: 0.16.3
|
||||
appVersion: v3.3.6
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
|
|
@ -15,4 +15,4 @@ maintainers:
|
|||
- name: benjaminws
|
||||
annotations:
|
||||
artifacthub.io/changes: |
|
||||
- "[Fixed]: Remove unsupported value"
|
||||
- "[Added]: Support for mainContainer config"
|
||||
|
|
|
|||
|
|
@ -127,6 +127,15 @@ Fields to note:
|
|||
| controller.workflowRestrictions | object | `{}` | Restricts the Workflows that the controller will process. Only valid for 2.9+ |
|
||||
| controller.workflowWorkers | string | `nil` | Number of workflow workers |
|
||||
|
||||
### Workflow Main Container
|
||||
|
||||
| Key | Type | Default | Description |
|
||||
|-----|------|---------|-------------|
|
||||
| mainContainer.env | object | `{}` | Adds environment variables for the Workflow main container |
|
||||
| mainContainer.imagePullPolicy | string | `"Always"` | imagePullPolicy to apply to 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 |
|
||||
|
||||
### Workflow Executor
|
||||
|
||||
| Key | Type | Default | Description |
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ Fields to note:
|
|||
| Key | Type | Default | Description |
|
||||
|-----|------|---------|-------------|
|
||||
{{- range .Values }}
|
||||
{{- if not (or (hasPrefix "workflow" .Key) (hasPrefix "controller" .Key) (hasPrefix "executor" .Key) (hasPrefix "server" .Key) (hasPrefix "artifactRepository" .Key) (hasPrefix "use" .Key) ) }}
|
||||
{{- if not (or (hasPrefix "workflow" .Key) (hasPrefix "controller" .Key) (hasPrefix "executor" .Key) (hasPrefix "server" .Key) (hasPrefix "artifactRepository" .Key) (hasPrefix "use" .Key) (hasPrefix "mainContainer" .Key) ) }}
|
||||
| {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} |
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
@ -67,6 +67,16 @@ Fields to note:
|
|||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
### Workflow Main Container
|
||||
|
||||
| Key | Type | Default | Description |
|
||||
|-----|------|---------|-------------|
|
||||
{{- range .Values }}
|
||||
{{- if hasPrefix "mainContainer" .Key }}
|
||||
| {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} |
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
### Workflow Executor
|
||||
|
||||
| Key | Type | Default | Description |
|
||||
|
|
|
|||
|
|
@ -30,6 +30,19 @@ data:
|
|||
{{- with .Values.controller.initialDelay }}
|
||||
initialDelay: {{ . }}
|
||||
{{- end }}
|
||||
{{- if or .Values.mainContainer.resources .Values.mainContainer.env .Values.mainContainer.securityContext}}
|
||||
mainContainer:
|
||||
imagePullPolicy: {{ .Values.images.pullPolicy }}
|
||||
{{- with .Values.mainContainer.resources }}
|
||||
resources: {{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.mainContainer.env }}
|
||||
env: {{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.mainContainer.securityContext }}
|
||||
securityContext: {{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if or .Values.executor.resources .Values.executor.env .Values.executor.securityContext}}
|
||||
executor:
|
||||
imagePullPolicy: {{ .Values.images.pullPolicy }}
|
||||
|
|
|
|||
|
|
@ -262,6 +262,17 @@ controller:
|
|||
# -- Extra containers to be added to the controller deployment
|
||||
extraContainers: []
|
||||
|
||||
# mainContainer adds default config for main container that could be overriden in workflows template
|
||||
mainContainer:
|
||||
# -- imagePullPolicy to apply to Workflow main container
|
||||
imagePullPolicy: Always
|
||||
# -- Resource limits and requests for the Workflow main container
|
||||
resources: {}
|
||||
# -- Adds environment variables for the Workflow main container
|
||||
env: {}
|
||||
# -- sets security context for the Workflow main container
|
||||
securityContext: {}
|
||||
|
||||
# executor controls how the init and wait container should be customized
|
||||
executor:
|
||||
image:
|
||||
|
|
|
|||
Loading…
Reference in New Issue