Merge branch 'master' into better-connection-strings

Author: lindhe

charts/invenio/templates/flower/deployment.yaml

@@ -45,6 +45,15 @@ spec:
                   name: {{ .Values.flower.secret_name }}
                   key: FLOWER_BASIC_AUTH_CREDENTIALS
             {{- include "invenio.config.queue" . | nindent 12 }}
+          {{- if (or .Values.invenio.extraEnvFrom .Values.flower.extraEnvFrom) }}
+          envFrom:
+            {{- with .Values.invenio.extraEnvFrom }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+            {{- with .Values.flower.extraEnvFrom }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+          {{- end }}
           {{- if .Values.flower.resources }}
           resources: {{- toYaml .Values.flower.resources | nindent 12 }}
           {{- end }}

charts/invenio/templates/web-deployment.yaml

@@ -33,6 +33,12 @@ spec:
             name: {{ include "invenio.fullname" . }}-config
         - secretRef:
             name: {{ include "invenio.secretName" . }}
+        {{- with .Values.invenio.extraEnvFrom }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
+        {{- with .Values.web.extraEnvFrom }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
         env:
         - name: TZ
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

charts/invenio/templates/worker-beat-deployment.yaml

@@ -45,6 +45,12 @@ spec:
             name: {{ include "invenio.fullname" . }}-config
         - secretRef:
             name: {{ include "invenio.secretName" . }}
+        {{- with .Values.invenio.extraEnvFrom }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
+        {{- with .Values.workerBeat.extraEnvFrom }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
         env:
         - name: TZ
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

charts/invenio/templates/worker-deployment.yaml

@@ -36,6 +36,12 @@ spec:
                 name: {{ include "invenio.fullname" . }}-config
             - secretRef:
                 name: {{ include "invenio.secretName" . }}
+            {{- with .Values.invenio.extraEnvFrom }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+            {{- with .Values.worker.extraEnvFrom }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
           env:
           - name: TZ
             value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

charts/invenio/values.yaml

@@ -85,6 +85,13 @@ invenio:
     #       name: name-of-my-secret
     #       key: KEY_IN_MY_SECRET
   uwsgiExtraConfig: {}
+  ## @param invenio.extraEnvFrom Extra secretRef or configMapRef for the `envFrom` field in all Invenio containers
+  ##
+  extraEnvFrom: []
+    # - secretRef:
+    #     name: foo
+    # - configMapRef:
+    #     name: bar
 
   ## @param invenio.vocabularies Vocabularies to be loaded as files under /app_data/vocabularies
   ## Example
@@ -234,6 +241,13 @@ web:
     capabilities:
       drop:
         - ALL
+  ## @param web.extraEnvFrom Extra secretRef or configMapRef for the `envFrom` field in the web container
+  ##
+  extraEnvFrom: []
+    # - secretRef:
+    #     name: foo
+    # - configMapRef:
+    #     name: bar
 
 worker:
   enabled: true
@@ -273,6 +287,13 @@ worker:
     capabilities:
       drop:
         - ALL
+  ## @param worker.extraEnvFrom Extra secretRef or configMapRef for the `envFrom` field in the worker container
+  ##
+  extraEnvFrom: []
+    # - secretRef:
+    #     name: foo
+    # - configMapRef:
+    #     name: bar
 
 workerBeat:
   ## @param workerBeat.extraEnvVars Extra environment variables (templated) to be added to the pods.
@@ -300,6 +321,13 @@ workerBeat:
     runAsGroup: 1000
     seccompProfile:
       type: "RuntimeDefault"
+  ## @param workerBeat.extraEnvFrom Extra secretRef or configMapRef for the `envFrom` field in the worker-beat container
+  ##
+  extraEnvFrom: []
+    # - secretRef:
+    #     name: foo
+    # - configMapRef:
+    #     name: bar
 
 persistence:
   enabled: true
@@ -384,6 +412,13 @@ flower:
     limits:
       memory: 250Mi
       cpu: 0.1
+  ## @param flower.extraEnvFrom Extra secretRef or configMapRef for the `envFrom` field in the flower container
+  ##
+  extraEnvFrom: []
+    # - secretRef:
+    #     name: foo
+    # - configMapRef:
+    #     name: bar
 
 ## PostgreSQL chart configuration
 ## ref: https://github.com/bitnami/charts/blob/main/bitnami/postgresql/values.yaml