[elasticsearch] Add envFrom parameter

elastic · Apr 8, 2020 · e4fe0e5 · e4fe0e5
1 parent 6b567c3
commit e4fe0e5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
@@ -99,6 +99,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.6.2
 | `esMajorVersion`                   | Used to set major version specific configuration. If you are using a custom image and not running the default Elasticsearch version you will need to set this to the version you are running (e.g. `esMajorVersion: 6`)                                                                                                     | `""`                                                                                                                      |
 | `esConfig`                         | Allows you to add any config files in `/usr/share/elasticsearch/config/` such as `elasticsearch.yml` and `log4j2.properties`. See [values.yaml](https://github.com/elastic/helm-charts/tree/master/elasticsearch/values.yaml) for an example of the formatting.                                                             | `{}`                                                                                                                      |
 | `extraEnvs`                        | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container                                                                          | `[]`                                                                                                                      |
+| `envFrom`                          | Templatable string of envFrom to be passed to the  [environment from variables](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables) which will be appended to the `envFrom:` definition for the container    | `[]`                                                                                                                      |
 | `extraVolumes`                     | Templatable string of additional volumes to be passed to the `tpl` function                                                                                                                                                                                                                                                 | `""`                                                                                                                      |
 | `extraVolumeMounts`                | Templatable string of additional volumeMounts to be passed to the `tpl` function                                                                                                                                                                                                                                            | `""`                                                                                                                      |
 | `extraContainers`                  | Templatable string of additional containers to be passed to the `tpl` function                                                                                                                                                                                                                                              | `""`                                                                                                                      |

diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
@@ -173,6 +173,7 @@ spec:
 
           cp -a /usr/share/elasticsearch/config/elasticsearch.keystore /tmp/keystore/
         env: {{ toYaml .Values.extraEnvs | nindent 10 }}
+        envFrom: {{ toYaml .Values.envFrom | nindent 10 }}
         resources: {{ toYaml .Values.initResources | nindent 10 }}
         volumeMounts:
           - name: keystore
@@ -266,6 +267,10 @@ spec:
           {{- end }}
 {{- if .Values.extraEnvs }}
 {{ toYaml .Values.extraEnvs | indent 10 }}
+{{- end }}
+{{- if .Values.envFrom }}
+        envFrom:
+{{ toYaml .Values.envFrom | indent 10 }}
 {{- end }}
         volumeMounts:
           {{- if .Values.persistence.enabled }}
@@ -344,6 +349,10 @@ spec:
         {{- if .Values.extraEnvs }}
 {{ toYaml .Values.extraEnvs | indent 10 }}
         {{- end }}
+        {{- if .Values.envFrom }}
+        envFrom:
+{{ toYaml .Values.envFrom | indent 10 }}
+        {{- end }}
       {{- end }}
       {{- end }}
 {{- if .Values.lifecycle }}

diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -283,6 +283,15 @@ def test_adding_extra_env_vars():
     env = r["statefulset"][uname]["spec"]["template"]["spec"]["containers"][0]["env"]
     assert {"name": "hello", "value": "world"} in env
 
+def test_adding_env_from():
+    config = """
+envFrom:
+- secretRef:
+    name: secret-name
+"""
+    r = helm_template(config)
+    secretRef = r["statefulset"][uname]["spec"]["template"]["spec"]["containers"][0]["envFrom"][0]["secretRef"]
+    assert secretRef == {"name": "secret-name"}
 
 def test_adding_a_extra_volume_with_volume_mount():
     config = """

diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
@@ -34,6 +34,13 @@ extraEnvs: []
 #  - name: MY_ENVIRONMENT_VAR
 #    value: the_value_goes_here
 
+# Allows you to load environment variables from kubernetes secret or config map
+envFrom: []
+# - secretRef:
+#     name: env-secret
+# - configMapRef:
+#     name: config-map
+
 # A list of secrets and their paths to mount inside the pod
 # This is useful for mounting certificates for security and for mounting
 # the X-Pack license