add extraEnvVars to the invenio block and deprecate invenio.extra_env_from_secret

charts/invenio/templates/NOTES.txt

@@ -4,25 +4,25 @@ Your release is named {{ .Release.Name }}.
 
 {{- if .Values.invenio.extra_config}}
 
-DEPRECATION WARNING: 
+DEPRECATION WARNING:
     `invenio.extra_config` has been renamed to `invenio.extraConfig` and will be
     removed in a future release.
 
 {{- end }}
 
 {{- if .Values.invenio.sentry.existing_secret }}
 
-DEPRECATION WARNING: 
-    `invenio.sentry.existing_secret` has been renamed to `invenio.sentry.existingSecret` 
+DEPRECATION WARNING:
+    `invenio.sentry.existing_secret` has been renamed to `invenio.sentry.existingSecret`
     and its type has changed from boolean to string.
     This key will be removed in a future release.
 
 {{- end }}
 
 {{- if .Values.invenio.sentry.secret_name }}
 
-DEPRECATION WARNING: 
-    `invenio.sentry.secret_name` has been removed in favor of 
+DEPRECATION WARNING:
+    `invenio.sentry.secret_name` has been removed in favor of
     `invenio.sentry.existingSecret` will be removed in a future release.
 
 {{- end }}
@@ -47,7 +47,7 @@ DEPRECATION WARNING:
 
 {{- if .Values.invenio.datacite.existing_secret }}
 
-DEPRECATION WARNING: 
+DEPRECATION WARNING:
     `invenio.datacite.existing_secret` has been renamed to `invenio.datacite.existingSecret`
     and its type has changed from boolean to string.
     This key will be removed in a future release.
@@ -56,7 +56,7 @@ DEPRECATION WARNING:
 
 {{- if .Values.invenio.datacite.secret_name }}
 
-DEPRECATION WARNING: 
+DEPRECATION WARNING:
     `invenio.datacite.secret_name` has been renamed in favor of
     `invenio.datacite.existingSecret` will be removed in a future release.
 
@@ -108,3 +108,11 @@ https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
 {{/*
 END: Warning on unset resources.
 */}}
+
+{{- if .Values.invenio.extra_env_from_secret }}
+
+DEPRECATION WARNING:
+    `invenio.extra_env_from_secret` will be removed in future a release.
+    Use `invenio.extraEnvFrom` or `invenio.extraEnvVars` instead.
+
+{{- end }}

charts/invenio/templates/install-init-job.yaml

@@ -33,13 +33,16 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "invenio.fullname" . }}-config
-         - secretRef:
+        - secretRef:
             name: {{ include "invenio.secretName" . }}
         env:
         - name: TZ
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}
         {{- include "invenio.config.queue" . | nindent 8 }}
         {{- include "invenio.config.database" . | nindent 8 }}
+        {{- with .Values.invenio.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         volumeMounts:
           {{- range $key, $value := .Values.invenio.vocabularies }}
           - name: vocabularies

charts/invenio/templates/web-deployment.yaml

@@ -50,6 +50,9 @@ spec:
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}
         {{- include "invenio.config.queue" . | nindent 8 }}
         {{- include "invenio.config.database" . | nindent 8 }}
+        {{- with .Values.invenio.extraEnvVars }}
+        {{-  toYaml . | nindent 8 }}
+        {{- end }}
         {{- with .Values.web.extraEnvVars }}
         {{-  toYaml . | nindent 8 }}
         {{- end }}

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

@@ -64,6 +64,9 @@ spec:
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}
         {{- include "invenio.config.queue" . | nindent 8 }}
         {{- include "invenio.config.database" . | nindent 8}}
+        {{- with .Values.invenio.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         {{- with .Values.workerBeat.extraEnvVars }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/invenio/templates/worker-deployment.yaml

@@ -53,6 +53,9 @@ spec:
             value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}
           {{- include "invenio.config.queue" . | nindent 10 }}
           {{- include "invenio.config.database" . | nindent 10 }}
+          {{- with .Values.invenio.extraEnvVars }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
           {{- with .Values.worker.extraEnvVars }}
           {{- toYaml . | nindent 10 }}
           {{- end }}

charts/invenio/values.yaml

@@ -99,12 +99,11 @@ invenio:
   ## @param invenio.extraConfig Extra environment variables (templated) to be added to all the pods.
   ##
   extraConfig: {}
+  ## @param invenio.extra_env_from_secret DEPRECATED: Use `invenio.extraEnvFrom` or `invenio.extraEnvVars` instead.
   extra_env_from_secret: []
-    # - name: NAME_OF_MY_ENV_VAR
-    #   valueFrom:
-    #     secretKeyRef:
-    #       name: name-of-my-secret
-    #       key: KEY_IN_MY_SECRET
+  ## @param invenio.extraEnvVars Extra environment variables to be added to all the pods.
+  ##
+  extraEnvVars: []
   uwsgiExtraConfig: {}
   ## @param invenio.extraEnvFrom Extra secretRef or configMapRef for the `envFrom` field in all Invenio containers
   ##
@@ -214,7 +213,7 @@ web:
   uwsgi:
     processes: 6
     threads: 4
-  ## @param web.extraEnvVars Extra environment variables (templated) to be added to the pods.
+  ## @param web.extraEnvVars Extra environment variables to be added to the pods.
   ##
   extraEnvVars: []
   autoscaler:
@@ -323,7 +322,7 @@ worker:
   run_mount_path: /var/run/celery
   celery_pidfile: /var/run/celery/celerybeat.pid
   celery_schedule: /var/run/celery/celery-schedule
-  ## @param worker.extraEnvVars Extra environment variables (templated) to be added to the pods.
+  ## @param worker.extraEnvVars Extra environment variables to be added to the pods.
   ##
   extraEnvVars: []
   ## @param worker.resources `resources` for the worker container
@@ -374,7 +373,7 @@ worker:
   tolerations: []
 
 workerBeat:
-  ## @param workerBeat.extraEnvVars Extra environment variables (templated) to be added to the pods.
+  ## @param workerBeat.extraEnvVars Extra environment variables to be added to the pods.
   ##
   extraEnvVars: []
   ## @param workerBeat.resources `resources` for the worker-beat container