feat: add envFrom support (#111)

Signed-off-by: t3mi <t3mi@users.noreply.github.com>
dgraph-io · Nov 11, 2024 · 3ddfc26 · 3ddfc26
1 parent 5686d2f
commit 3ddfc26
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/charts/dgraph/README.md b/charts/dgraph/README.md
@@ -85,6 +85,7 @@ The following table lists the configurable parameters of the `dgraph` chart and
 | `zero.antiAffinity`                      | Zero anti-affinity policy                                             | `soft`                                              |
 | `zero.podAntiAffinitytopologyKey`        | Anti affinity topology key for zero nodes                             | `kubernetes.io/hostname`                            |
 | `zero.nodeAffinity`                      | Zero node affinity policy                                             | `{}`                                                |
+| `zero.envFrom`                           | Extra environment variables loaded from configmap(s) and/or secret(s) | `[]`                                                |
 | `zero.extraEnvs`                         | extra env vars                                                        | `[]`                                                |
 | `zero.extraFlags`                        | Zero extra flags for command line                                     | `""`                                                |
 | `zero.configFile`                        | Zero config file                                                      | `{}`                                                |
@@ -127,6 +128,7 @@ The following table lists the configurable parameters of the `dgraph` chart and
 | `alpha.antiAffinity`                     | Alpha anti-affinity policy                                            | `soft`                                              |
 | `alpha.podAntiAffinitytopologyKey`       | Anti affinity topology key for zero nodes                             | `kubernetes.io/hostname`                            |
 | `alpha.nodeAffinity`                     | Alpha node affinity policy                                            | `{}`                                                |
+| `alpha.envFrom`                          | Extra environment variables loaded from configmap(s) and/or secret(s) | `[]`                                                |
 | `alpha.extraEnvs`                        | extra env vars                                                        | `[]`                                                |
 | `alpha.extraFlags`                       | Alpha extra flags for command                                         | `""`                                                |
 | `alpha.configFile`                       | Alpha config file                                                     | `{}`                                                |
@@ -177,6 +179,7 @@ The following table lists the configurable parameters of the `dgraph` chart and
 | `alpha.initContainers.init.image.tag`        | Alpha initContainer image tag                                     | `v21.03.0`                                          |
 | `alpha.initContainers.init.image.pullPolicy` | Alpha initContainer pull policy                                   | `IfNotPresent`                                      |
 | `alpha.initContainers.init.env` | Adds environment variables for the alpha init container                                  | `[]`                                      |
+| `alpha.initContainers.init.envFrom`      | Extra environment variables loaded from configmap(s) and/or secret(s) | `[]`                                                |
 | `alpha.initContainers.init.command`      | Alpha initContainer command line to execute                           | See `values.yaml` for defaults                      |
 | `ratel.name`                             | Ratel component name                                                  | `ratel`                                             |
 | `ratel.enabled`                          | Ratel service enabled or disabled                                     | `false`                                             |
@@ -188,6 +191,7 @@ The following table lists the configurable parameters of the `dgraph` chart and
 | `ratel.image.pullPolicy`                 | Container pull policy                                                 | `IfNotPresent`                                      |
 | `ratel.schedulerName`                    | Configure an explicit scheduler                                       | `nil`                                               |
 | `ratel.replicaCount`                     | Number of ratel nodes                                                 | `1`                                                 |
+| `ratel.envFrom`                          | Extra environment variables loaded from configmap(s) and/or secret(s) | `[]`                                                |
 | `ratel.extraEnvs`                        | Extra env vars                                                        | `[]`                                                |
 | `ratel.args`                             | Ratel command line arguments                                          | `[]`                                                |
 | `ratel.automountServiceAccountToken`     | automatially mount a ServiceAccount API credentials                   | `true`                                              |

diff --git a/charts/dgraph/templates/alpha/statefulset.yaml b/charts/dgraph/templates/alpha/statefulset.yaml
@@ -142,6 +142,10 @@ spec:
         env:
           {{- tpl (toYaml .) $ | nindent 10 }}
         {{- end }}
+        {{- with .Values.alpha.initContainers.init.envFrom }}
+        envFrom:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         command:
         {{- range .Values.alpha.initContainers.init.command }}
           - {{ . | quote }}
@@ -200,6 +204,10 @@ spec:
         {{- with .Values.alpha.extraEnvs }}
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- with .Values.alpha.envFrom }}
+        envFrom:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{/* NOTE: awk '{gsub(/\.$/,"") needed to trim */}}
         command:
           - bash

diff --git a/charts/dgraph/templates/ratel/deployment.yaml b/charts/dgraph/templates/ratel/deployment.yaml
@@ -58,6 +58,10 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         {{- end }}
+        {{- with .Values.ratel.envFrom }}
+        envFrom:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         args: {{ .Values.ratel.args | toYaml | nindent 10 }}
         command:
           - dgraph-ratel

diff --git a/charts/dgraph/templates/zero/statefulset.yaml b/charts/dgraph/templates/zero/statefulset.yaml
@@ -143,6 +143,10 @@ spec:
         {{- with .Values.zero.extraEnvs }}
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- with .Values.zero.envFrom }}
+        envFrom:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         command:
           - bash
           - "-c"

diff --git a/charts/dgraph/values.yaml b/charts/dgraph/values.yaml
@@ -97,6 +97,9 @@ zero:
   ## https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature
   nodeAffinity: {}
 
+  ## Extra environment variables loaded from configmap(s) and/or secret(s)
+  envFrom: []
+
   ## Extra environment variables which will be appended to the env: definition for the container.
   extraEnvs: []
 
@@ -276,6 +279,9 @@ alpha:
   ## https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature
   nodeAffinity: {}
 
+  ## Extra environment variables loaded from configmap(s) and/or secret(s)
+  envFrom: []
+
   ## Extra environment variables which will be appended to the env: definition for the container.
   extraEnvs: []
     # - name: AWS_ACCESS_KEY_ID
@@ -462,6 +468,7 @@ alpha:
       enabled: false
       # Adds environment variables for the alpha init container
       env: []
+      envFrom: []
       image:
         << : *image
       command:
@@ -499,6 +506,9 @@ ratel:
   ##
   replicaCount: 1
 
+  ## Extra environment variables loaded from configmap(s) and/or secret(s)
+  envFrom: []
+
   # Extra environment variables which will be appended to the env: definition for the container.
   extraEnvs: []