feat: add support for envFrom
Signed-off-by: Michał Czeraszkiewicz <contact@czerasz.com>
This commit is contained in:
parent
35c754364f
commit
4e3707e12a
6 changed files with 59 additions and 0 deletions
|
@ -70,6 +70,10 @@ spec:
|
||||||
{{- if .Values.controller.env }}
|
{{- if .Values.controller.env }}
|
||||||
env:
|
env:
|
||||||
{{- toYaml .Values.controller.env | nindent 8 }}
|
{{- toYaml .Values.controller.env | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.controller.envFrom }}
|
||||||
|
envFrom:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- name: controller
|
- name: controller
|
||||||
|
|
|
@ -67,6 +67,10 @@ spec:
|
||||||
value: argocd
|
value: argocd
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.openshift.envFrom }}
|
||||||
|
envFrom:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
{{- if .Values.repoServer.volumeMounts }}
|
{{- if .Values.repoServer.volumeMounts }}
|
||||||
{{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
|
{{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
|
||||||
|
|
|
@ -67,6 +67,10 @@ spec:
|
||||||
{{- if .Values.server.env }}
|
{{- if .Values.server.env }}
|
||||||
env:
|
env:
|
||||||
{{- toYaml .Values.server.env | nindent 8 }}
|
{{- toYaml .Values.server.env | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.server.envFrom }}
|
||||||
|
envFrom:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
{{- if .Values.server.volumeMounts }}
|
{{- if .Values.server.volumeMounts }}
|
||||||
|
|
|
@ -62,6 +62,10 @@ spec:
|
||||||
{{- if .Values.dex.env }}
|
{{- if .Values.dex.env }}
|
||||||
env:
|
env:
|
||||||
{{- toYaml .Values.dex.env | nindent 8 }}
|
{{- toYaml .Values.dex.env | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.dex.envFrom }}
|
||||||
|
envFrom:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
|
|
|
@ -52,6 +52,10 @@ spec:
|
||||||
{{- if .Values.redis.env }}
|
{{- if .Values.redis.env }}
|
||||||
env:
|
env:
|
||||||
{{- toYaml .Values.redis.env | nindent 8 }}
|
{{- toYaml .Values.redis.env | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.redis.envFrom }}
|
||||||
|
envFrom:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- containerPort: {{ .Values.redis.containerPort }}
|
- containerPort: {{ .Values.redis.containerPort }}
|
||||||
|
|
|
@ -61,6 +61,14 @@ controller:
|
||||||
# - name: "ARGOCD_CONTROLLER_REPLICAS"
|
# - name: "ARGOCD_CONTROLLER_REPLICAS"
|
||||||
# value: ""
|
# value: ""
|
||||||
|
|
||||||
|
## envFrom to pass to argocd-controller
|
||||||
|
##
|
||||||
|
envFrom: []
|
||||||
|
# - configMapRef:
|
||||||
|
# name: config-map-name
|
||||||
|
# - secretRef:
|
||||||
|
# name: secret-name
|
||||||
|
|
||||||
## Annotations to be added to controller pods
|
## Annotations to be added to controller pods
|
||||||
##
|
##
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
@ -219,6 +227,13 @@ dex:
|
||||||
##
|
##
|
||||||
env: []
|
env: []
|
||||||
|
|
||||||
|
## envFrom to pass to the Dex server
|
||||||
|
envFrom: []
|
||||||
|
# - configMapRef:
|
||||||
|
# name: config-map-name
|
||||||
|
# - secretRef:
|
||||||
|
# name: secret-name
|
||||||
|
|
||||||
## Annotations to be added to the Dex server pods
|
## Annotations to be added to the Dex server pods
|
||||||
##
|
##
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
@ -301,6 +316,14 @@ redis:
|
||||||
##
|
##
|
||||||
env: []
|
env: []
|
||||||
|
|
||||||
|
## envFrom to pass to the Redis server
|
||||||
|
##
|
||||||
|
envFrom: []
|
||||||
|
# - configMapRef:
|
||||||
|
# name: config-map-name
|
||||||
|
# - secretRef:
|
||||||
|
# name: secret-name
|
||||||
|
|
||||||
## Annotations to be added to the Redis server pods
|
## Annotations to be added to the Redis server pods
|
||||||
##
|
##
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
@ -391,6 +414,14 @@ server:
|
||||||
##
|
##
|
||||||
env: []
|
env: []
|
||||||
|
|
||||||
|
## envFrom to pass to argocd-server
|
||||||
|
##
|
||||||
|
envFrom: []
|
||||||
|
# - configMapRef:
|
||||||
|
# name: config-map-name
|
||||||
|
# - secretRef:
|
||||||
|
# name: secret-name
|
||||||
|
|
||||||
## Specify postStart and preStop lifecycle hooks for your argo-cd-server container
|
## Specify postStart and preStop lifecycle hooks for your argo-cd-server container
|
||||||
##
|
##
|
||||||
lifecycle: {}
|
lifecycle: {}
|
||||||
|
@ -762,6 +793,14 @@ repoServer:
|
||||||
##
|
##
|
||||||
env: []
|
env: []
|
||||||
|
|
||||||
|
## envFrom to pass to argocd-repo-server
|
||||||
|
##
|
||||||
|
envFrom: []
|
||||||
|
# - configMapRef:
|
||||||
|
# name: config-map-name
|
||||||
|
# - secretRef:
|
||||||
|
# name: secret-name
|
||||||
|
|
||||||
## Argo repoServer log format: text|json
|
## Argo repoServer log format: text|json
|
||||||
logFormat: text
|
logFormat: text
|
||||||
## Argo repoServer log level
|
## Argo repoServer log level
|
||||||
|
|
Loading…
Reference in a new issue