Merge branch 'master' into feat/readonly-columns
This commit is contained in:
commit
0c79935170
5 changed files with 44 additions and 2 deletions
|
@ -202,6 +202,13 @@ spec:
|
|||
- name: {{ .name }}
|
||||
value: {{ .value | quote }}
|
||||
{{- end }}
|
||||
{{- range .Values.services.apps.extraEnvFromSecret}}
|
||||
- name: {{ .name }}
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .secretName }}
|
||||
key: {{ .secretKey | quote }}
|
||||
{{- end}}
|
||||
image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
|
||||
imagePullPolicy: Always
|
||||
{{- if .Values.services.apps.startupProbe }}
|
||||
|
|
|
@ -201,6 +201,13 @@ spec:
|
|||
- name: {{ .name }}
|
||||
value: {{ .value | quote }}
|
||||
{{- end }}
|
||||
{{- range .Values.services.automationWorkers.extraEnvFromSecret}}
|
||||
- name: {{ .name }}
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .secretName }}
|
||||
key: {{ .secretKey | quote }}
|
||||
{{- end}}
|
||||
|
||||
image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
|
||||
imagePullPolicy: Always
|
||||
|
@ -272,4 +279,4 @@ spec:
|
|||
{{- toYaml .Values.services.automationWorkers.extraVolumes | nindent 8 }}
|
||||
{{ end }}
|
||||
status: {}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
@ -188,6 +188,13 @@ spec:
|
|||
- name: {{ .name }}
|
||||
value: {{ .value | quote }}
|
||||
{{- end }}
|
||||
{{- range .Values.services.worker.extraEnvFromSecret}}
|
||||
- name: {{ .name }}
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .secretName }}
|
||||
key: {{ .secretKey | quote }}
|
||||
{{- end}}
|
||||
image: budibase/worker:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
|
||||
imagePullPolicy: Always
|
||||
{{- if .Values.services.worker.startupProbe }}
|
||||
|
|
|
@ -240,6 +240,13 @@ services:
|
|||
# -- Extra environment variables to set for apps pods. Takes a list of
|
||||
# name=value pairs.
|
||||
extraEnv: []
|
||||
# -- Name of the K8s Secret in the same namespace which contains the extra environment variables.
|
||||
# This can be used to avoid storing sensitive information in the values.yaml file.
|
||||
extraEnvFromSecret: []
|
||||
# - name: MY_SECRET_KEY
|
||||
# secretName : my-secret
|
||||
# secretKey: my-secret-key
|
||||
|
||||
# -- Startup probe configuration for apps pods. You shouldn't need to
|
||||
# change this, but if you want to you can find more information here:
|
||||
# <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>
|
||||
|
@ -323,6 +330,13 @@ services:
|
|||
# -- Extra environment variables to set for automation worker pods. Takes a list of
|
||||
# name=value pairs.
|
||||
extraEnv: []
|
||||
# -- Name of the K8s Secret in the same namespace which contains the extra environment variables.
|
||||
# This can be used to avoid storing sensitive information in the values.yaml file.
|
||||
extraEnvFromSecret: []
|
||||
# - name: MY_SECRET_KEY
|
||||
# secretName : my-secret
|
||||
# secretKey: my-secret-key
|
||||
|
||||
# -- Startup probe configuration for automation worker pods. You shouldn't
|
||||
# need to change this, but if you want to you can find more information
|
||||
# here:
|
||||
|
@ -408,6 +422,13 @@ services:
|
|||
# -- Extra environment variables to set for worker pods. Takes a list of
|
||||
# name=value pairs.
|
||||
extraEnv: []
|
||||
# -- Name of the K8s Secret in the same namespace which contains the extra environment variables.
|
||||
# This can be used to avoid storing sensitive information in the values.yaml file.
|
||||
extraEnvFromSecret: []
|
||||
# - name: MY_SECRET_KEY
|
||||
# secretName : my-secret
|
||||
# secretKey: my-secret-key
|
||||
|
||||
# -- Startup probe configuration for worker pods. You shouldn't need to
|
||||
# change this, but if you want to you can find more information here:
|
||||
# <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d3c3077011a8e20ed3c48dcd6301caca4120b6ac
|
||||
Subproject commit 5189b83bea1868574ff7f4c51fe5db38a11badb8
|
Loading…
Reference in a new issue