diff --git a/monitor-helm-elastic/centos/monitor-helm-elastic.spec b/monitor-helm-elastic/centos/monitor-helm-elastic.spec index 74daf21..760a6a1 100644 --- a/monitor-helm-elastic/centos/monitor-helm-elastic.spec +++ b/monitor-helm-elastic/centos/monitor-helm-elastic.spec @@ -27,6 +27,7 @@ Patch06: 0006-Metricbeat-nodeSelector-and-tolerations-config.patch Patch07: 0007-Add-command-and-args-parameters-to-beats-and-logstash.patch Patch08: 0008-Add-updateStrategy-parameter-to-beats-config.patch Patch09: 0009-Add-hostNetworking-parameter-to-logstash-config.patch +Patch10: 0010-Fix-esConfig-checksum-annotation.patch BuildRequires: helm @@ -44,6 +45,7 @@ Monitor Helm elasticsearch charts %patch07 -p1 %patch08 -p1 %patch09 -p1 +%patch10 -p1 %build # initialize helm and build the toolkit diff --git a/monitor-helm-elastic/files/0010-Fix-esConfig-checksum-annotation.patch b/monitor-helm-elastic/files/0010-Fix-esConfig-checksum-annotation.patch new file mode 100644 index 0000000..eaa1d15 --- /dev/null +++ b/monitor-helm-elastic/files/0010-Fix-esConfig-checksum-annotation.patch @@ -0,0 +1,25 @@ +From 9d463c65aa5c5f7c6c6d75ba57da5e7b5c20fd3a Mon Sep 17 00:00:00 2001 +From: Simon Cousineau +Date: Thu, 16 Apr 2020 13:03:46 -0400 +Subject: [PATCH 1/1] Fix esConfig checksum annotation + +--- + elasticsearch/templates/statefulset.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml +index 16f9204..b4f6a98 100644 +--- a/elasticsearch/templates/statefulset.yaml ++++ b/elasticsearch/templates/statefulset.yaml +@@ -50,7 +50,7 @@ spec: + {{- end }} + {{/* This forces a restart if the configmap has changed */}} + {{- if .Values.esConfig }} +- configchecksum: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum | trunc 63 }} ++ configchecksum: {{ toYaml .Values.esConfig | sha256sum | trunc 63 }} + {{- end }} + spec: + {{- if .Values.schedulerName }} +-- +2.20.1 +