starlingx/monitor-armada-app
Code Issues Proposed changes

Add updateStrategy parameter to beats configs

Browse Source 
This change allows us to define additional parameters for the
metricbeat and filebeat updateStrategy configs.

Change-Id: Ie586ad21311f743a3ee7b2da911b0d01361daca5
Signed-off-by: Simon Cousineau <Simon.Cousineau@windriver.com>
This commit is contained in:
Simon Cousineau 2020-04-14 11:26:23 -04:00
parent f97b837f49
commit 442ddcba07
2 changed files with 71 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

@ -25,6 +25,7 @@ Patch04: 0004-Update-Elastic-Apps-to-7.6.0-Releases.patch
Patch05: 0005-readiness-probe-enhancements.patch
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
BuildRequires: helm
@ -40,6 +41,7 @@ Monitor Helm elasticsearch charts
%patch05 -p1
%patch06 -p1
%patch07 -p1
%patch08 -p1
%build
# initialize helm and build the toolkit

69
monitor-helm-elastic/files/0008-Add-updateStrategy-parameter-to-beats-config.patch Normal file
View File

@ -0,0 +1,69 @@
From f65eaa1fb2dcfb913d22c152e84771507f99d6bd Mon Sep 17 00:00:00 2001
From: Simon Cousineau <Simon.Cousineau@windriver.com>
Date: Tue, 14 Apr 2020 11:05:18 -0400
Subject: [PATCH 1/1] Add updateStrategy parameter to beats config
---
filebeat/templates/daemonset.yaml | 2 +-
filebeat/values.yaml | 3 ++-
metricbeat/templates/daemonset.yaml | 2 +-
metricbeat/values.yaml | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/filebeat/templates/daemonset.yaml b/filebeat/templates/daemonset.yaml
index 6e8be91..9ab5255 100644
--- a/filebeat/templates/daemonset.yaml
+++ b/filebeat/templates/daemonset.yaml
@@ -17,7 +17,7 @@ spec:
app: "{{ template "filebeat.fullname" . }}"
release: {{ .Release.Name | quote }}
updateStrategy:
- type: {{ .Values.updateStrategy }}
+{{ toYaml .Values.updateStrategy | indent 4 }}
template:
metadata:
annotations:
diff --git a/filebeat/values.yaml b/filebeat/values.yaml
index f83a19f..21d4682 100755
--- a/filebeat/values.yaml
+++ b/filebeat/values.yaml
@@ -130,7 +130,8 @@ affinity: {}
# https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass
priorityClassName: ""
-updateStrategy: RollingUpdate
+updateStrategy:
+ type: RollingUpdate
# Override various naming aspects of this chart
# Only edit these if you know what you're doing
diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
index 0fa38c3..f193ba0 100644
--- a/metricbeat/templates/daemonset.yaml
+++ b/metricbeat/templates/daemonset.yaml
@@ -17,7 +17,7 @@ spec:
app: "{{ template "metricbeat.fullname" . }}"
release: {{ .Release.Name | quote }}
updateStrategy:
- type: {{ .Values.updateStrategy }}
+{{ toYaml .Values.updateStrategy | indent 4 }}
template:
metadata:
annotations:
diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
index 6d53f3e..39e2811 100755
--- a/metricbeat/values.yaml
+++ b/metricbeat/values.yaml
@@ -206,7 +206,8 @@ affinity: {}
# https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass
priorityClassName: ""
-updateStrategy: RollingUpdate
+updateStrategy:
+ type: RollingUpdate
# Override various naming aspects of this chart
# Only edit these if you know what you're doing
--
2.20.1