[logstash] Add envFrom parameter

elastic · Apr 21, 2020 · 85a2f2f · 85a2f2f
1 parent fe92c10
commit 85a2f2f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/logstash/README.md b/logstash/README.md
@@ -65,6 +65,7 @@ helm install --name logstash elastic/logstash --set imageTag=7.6.2
 | `antiAffinityTopologyKey`     | The [anti-affinity topology key](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity). By default this will prevent multiple Logstash nodes from running on the same Kubernetes node                                                                                             | `kubernetes.io/hostname`                                                                                                   |
 | `extraContainers`             | Templatable string of additional containers to be passed to the `tpl` function                                                                                                                                                                                                                                             | `""`                                                                                                                       |
 | `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   | `[]`                                                                                                                       |
 | `extraInitContainers`         | Templatable string of additional init containers to be passed to the `tpl` function                                                                                                                                                                                                                                        | `""`                                                                                                                       |
 | `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                                                                                                                                                                                                                                           | `""`                                                                                                                       |

diff --git a/logstash/templates/statefulset.yaml b/logstash/templates/statefulset.yaml
@@ -160,6 +160,10 @@ spec:
             value: "{{ .Values.logstashJavaOpts }}"
 {{- if .Values.extraEnvs }}
 {{ toYaml .Values.extraEnvs | indent 10 }}
+{{- end }}
+{{- if .Values.envFrom }}
+        envFrom:
+{{ toYaml .Values.envFrom | indent 10 }}
 {{- end }}
         volumeMounts:
           {{- if .Values.persistence.enabled }}

diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
@@ -141,6 +141,19 @@ def test_adding_extra_env_vars():
     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"][name]["spec"]["template"]["spec"]["containers"][0][
+        "envFrom"
+    ][0]["secretRef"]
+    assert secretRef == {"name": "secret-name"}
+
+
 def test_adding_a_extra_volume_with_volume_mount():
     config = """
 extraVolumes: |

diff --git a/logstash/values.yaml b/logstash/values.yaml
@@ -29,6 +29,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
 secretMounts: []