starlingx/monitor-armada-app
Code Issues Proposed changes

Fix esConfig checksum annotation

Browse Source 
This allows restart when elasticsearch configmap changes.

Change-Id: Ic16bc98fc3fa3d39d8448965a3b3463c03372d27
Signed-off-by: Simon Cousineau <Simon.Cousineau@windriver.com>
This commit is contained in:
Simon Cousineau 2020-04-16 13:10:05 -04:00
parent 64269d4f1b
commit d0190a4cc1
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor-helm-elastic/centos/monitor-helm-elastic.spec
View File

@ -27,6 +27,7 @@ Patch06: 0006-Metricbeat-nodeSelector-and-tolerations-config.patch
Patch07: 0007-Add-command-and-args-parameters-to-beats-and-logstash.patch Patch07: 0007-Add-command-and-args-parameters-to-beats-and-logstash.patch
Patch08: 0008-Add-updateStrategy-parameter-to-beats-config.patch Patch08: 0008-Add-updateStrategy-parameter-to-beats-config.patch
Patch09: 0009-Add-hostNetworking-parameter-to-logstash-config.patch Patch09: 0009-Add-hostNetworking-parameter-to-logstash-config.patch
Patch10: 0010-Fix-esConfig-checksum-annotation.patch
BuildRequires: helm BuildRequires: helm
@ -44,6 +45,7 @@ Monitor Helm elasticsearch charts
%patch07 -p1 %patch07 -p1
%patch08 -p1 %patch08 -p1
%patch09 -p1 %patch09 -p1
%patch10 -p1
%build %build
# initialize helm and build the toolkit # initialize helm and build the toolkit

25
monitor-helm-elastic/files/0010-Fix-esConfig-checksum-annotation.patch Normal file
View File

@ -0,0 +1,25 @@
From 9d463c65aa5c5f7c6c6d75ba57da5e7b5c20fd3a Mon Sep 17 00:00:00 2001
From: Simon Cousineau <Simon.Cousineau@windriver.com>
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