[metricbeat] remove unneeded if statement for envFrom

elastic · Apr 17, 2020 · 890428d · 890428d
1 parent 055313c
commit 890428d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
@@ -113,9 +113,7 @@ spec:
 {{- if .Values.extraEnvs | default .Values.daemonset.extraEnvs }}
 {{ toYaml ( .Values.extraEnvs | default .Values.daemonset.extraEnvs ) | indent 8 }}
 {{- end }}
-{{- if .Values.envFrom | default .Values.daemonset.envFrom }}
         envFrom: {{ toYaml ( .Values.envFrom | default .Values.daemonset.envFrom ) | nindent 10 }}
-{{- end }}
         securityContext: {{ toYaml ( .Values.podSecurityContext | default .Values.daemonset.securityContext ) | nindent 10 }}
         volumeMounts:
         {{- range .Values.secretMounts | default .Values.daemonset.secretMounts }}

diff --git a/metricbeat/templates/deployment.yaml b/metricbeat/templates/deployment.yaml
@@ -91,9 +91,7 @@ spec:
 {{- if .Values.extraEnvs | default .Values.deployment.extraEnvs }}
 {{ toYaml ( .Values.extraEnvs | default .Values.deployment.extraEnvs ) | indent 8 }}
 {{- end }}
-{{- if .Values.envFrom | default .Values.deployment.envFrom }}
         envFrom: {{ toYaml ( .Values.envFrom | default .Values.deployment.envFrom ) | nindent 10 }}
-{{- end }}
         securityContext: {{ toYaml ( .Values.podSecurityContext | default .Values.deployment.securityContext ) | nindent 10 }}
         volumeMounts:
         {{- range .Values.secretMounts | default .Values.deployment.secretMounts }}

diff --git a/metricbeat/tests/metricbeat_test.py b/metricbeat/tests/metricbeat_test.py
@@ -925,10 +925,10 @@ def test_adding_env_from():
         0
     ]["configMapRef"] == {"name": "configmap-name"}
     assert (
-        "envFrom"
-        not in r["deployment"][name + "-metrics"]["spec"]["template"]["spec"][
-            "containers"
-        ][0]
+        r["deployment"][name + "-metrics"]["spec"]["template"]["spec"]["containers"][0][
+            "envFrom"
+        ]
+        == []
     )
 
     config = """
@@ -942,8 +942,8 @@ def test_adding_env_from():
         0
     ]["envFrom"][0]["configMapRef"] == {"name": "configmap-name"}
     assert (
-        "envFrom"
-        not in r["daemonset"][name]["spec"]["template"]["spec"]["containers"][0]
+        r["daemonset"][name]["spec"]["template"]["spec"]["containers"][0]["envFrom"]
+        == []
     )