chore: update case for extra_env_from_secret

Author: egabancho

charts/invenio/templates/NOTES.txt

@@ -44,3 +44,11 @@ DEPRECATION WARNING:
     `invenio.existingSecret` and it will be removed in a future release.
 
 {{- end }}
+
+{{- if .Values.invenio.extra_env_from_secret }}
+
+DEPRECATION WARNING:
+    `invenio.extra_env_from_secret` has been removed in favor of
+    `invenio.extraEnvFromSecret` and it will be removed in a future release.
+
+{{- end }}

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

@@ -33,7 +33,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "invenio.fullname" . }}-config
-         - secretRef:
+        - secretRef:
             name: {{ include "invenio.secretName" . }}
         env:
         - name: TZ
@@ -44,6 +44,13 @@ spec:
           value: {{ include "invenio.rabbitmq.uri" . }}
         - name: INVENIO_SQLALCHEMY_DATABASE_URI
           value: {{ include "invenio.sqlAlchemyDbUri" . }}
+        {{- range .Values.invenio.extraEnvFromSecret }}
+        - name: {{ tpl .name $ }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ tpl .valueFrom.secretKeyRef.name $ }}
+              key: {{ tpl .valueFrom.secretKeyRef.key $ }}
+        {{- end }}
         volumeMounts:
           {{- range $key, $value := .Values.invenio.vocabularies }}
           - name: vocabularies

charts/invenio/templates/web-deployment.yaml

@@ -74,6 +74,13 @@ spec:
               name: {{ .valueFrom.secretKeyRef.name }}
               key: {{ .valueFrom.secretKeyRef.key }}
         {{- end }}
+        {{- range .Values.invenio.extraEnvFromSecret }}
+        - name: {{ tpl .name $ }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ tpl .valueFrom.secretKeyRef.name $ }}
+              key: {{ tpl .valueFrom.secretKeyRef.key $ }}
+        {{- end }}
         readinessProbe:
           exec:
             command:

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

@@ -77,6 +77,13 @@ spec:
               name: {{ .valueFrom.secretKeyRef.name }}
               key: {{ .valueFrom.secretKeyRef.key }}
         {{- end }}
+        {{- range .Values.invenio.extraEnvFromSecret }}
+        - name: {{ tpl .name $ }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ tpl .valueFrom.secretKeyRef.name $ }}
+              key: {{ tpl .valueFrom.secretKeyRef.key $ }}
+        {{- end }}
         livenessProbe:
           exec:
             command:

charts/invenio/templates/worker-deployment.yaml

@@ -77,6 +77,13 @@ spec:
                 name: {{ .valueFrom.secretKeyRef.name }}
                 key: {{ .valueFrom.secretKeyRef.key }}
           {{- end }}
+          {{- range .Values.invenio.extraEnvFromSecret }}
+          - name: {{ tpl .name $ }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ tpl .valueFrom.secretKeyRef.name $ }}
+                key: {{ tpl .valueFrom.secretKeyRef.key $ }}
+          {{- end }}
           livenessProbe:
             exec:
               command:

charts/invenio/values.yaml

@@ -78,12 +78,17 @@ invenio:
   ## @param invenio.extraConfig Extra environment variables (templated) to be added to all the pods.
   ##
   extraConfig: {}
+
+  ## @param invenio.extraEnvFromSecret Extra environment variables to pull from secrets
+  #  Example:
+  # - name: NAME_OF_MY_ENV_VAR
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: name-of-my-secret
+  #       key: KEY_IN_MY_SECRET
+  extraEnvFromSecret: []
+  ## @param invenio.extra_env_from_secret DEPRECATED: invenio.extraEnvFromSecret instead
   extra_env_from_secret: []
-    # - name: NAME_OF_MY_ENV_VAR
-    #   valueFrom:
-    #     secretKeyRef:
-    #       name: name-of-my-secret
-    #       key: KEY_IN_MY_SECRET
   uwsgiExtraConfig: {}
 
   ## @param invenio.vocabularies Vocabularies to be loaded as files under /app_data/vocabularies