Fix configchecksum not being set (elastic#634)

jmlrt · May 27, 2020 · e3e135a · e3e135a
1 parent 987729c
commit e3e135a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
@@ -25,7 +25,7 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
         {{/* This forces a restart if the configmap has changed */}}
-        {{- if .Values.metricbeatConfig }}
+        {{- if or  .Values.metricbeatConfig .Values.daemonset.metricbeatConfig }}
         configChecksum: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum | trunc 63 }}
         {{- end }}
       name: "{{ template "metricbeat.fullname" . }}"

diff --git a/metricbeat/templates/deployment.yaml b/metricbeat/templates/deployment.yaml
@@ -22,7 +22,7 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
         {{/* This forces a restart if the configmap has changed */}}
-        {{- if .Values.metricbeatConfig }}
+        {{- if or  .Values.metricbeatConfig .Values.deployment.metricbeatConfig }}
         configChecksum: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum | trunc 63 }}
         {{- end }}
       labels: