From 041a320351e387f7481faddc5531d3295bc316ed Mon Sep 17 00:00:00 2001 From: tetianakravchenko Date: Thu, 6 Jun 2019 16:10:17 +0200 Subject: [PATCH] [stable/elasticsearch] Rolling update statefulsets and deployment on configmap change (#14539) * [stable/elasticsearch] rolling update data/master statefulset and client deployment on configmap change Signed-off-by: Tetiana Kravchenko * [stable/elasticsearch] remove not needed if Signed-off-by: Tetiana Kravchenko * [stable/elasticsearch] set updateStrategy.type for data and master nodes to RollingUpdate Signed-off-by: Tetiana Kravchenko --- stable/elasticsearch/Chart.yaml | 2 +- stable/elasticsearch/ci/updatestrategy-values.yaml | 7 +++++++ stable/elasticsearch/templates/client-deployment.yaml | 3 ++- stable/elasticsearch/templates/data-statefulset.yaml | 9 +++++++-- stable/elasticsearch/templates/master-statefulset.yaml | 9 +++++++-- 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 stable/elasticsearch/ci/updatestrategy-values.yaml diff --git a/stable/elasticsearch/Chart.yaml b/stable/elasticsearch/Chart.yaml index fb623a5e98..69d0750141 100755 --- a/stable/elasticsearch/Chart.yaml +++ b/stable/elasticsearch/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: elasticsearch home: https://www.elastic.co/products/elasticsearch -version: 1.28.0 +version: 1.28.1 appVersion: 6.7.0 description: Flexible and powerful open source, distributed real-time search and analytics engine. diff --git a/stable/elasticsearch/ci/updatestrategy-values.yaml b/stable/elasticsearch/ci/updatestrategy-values.yaml new file mode 100644 index 0000000000..8288156ba3 --- /dev/null +++ b/stable/elasticsearch/ci/updatestrategy-values.yaml @@ -0,0 +1,7 @@ +data: + updateStrategy: + type: RollingUpdate + +master: + updateStrategy: + type: RollingUpdate diff --git a/stable/elasticsearch/templates/client-deployment.yaml b/stable/elasticsearch/templates/client-deployment.yaml index e7d111dae4..9bb106552a 100644 --- a/stable/elasticsearch/templates/client-deployment.yaml +++ b/stable/elasticsearch/templates/client-deployment.yaml @@ -16,8 +16,9 @@ spec: app: {{ template "elasticsearch.name" . }} component: "{{ .Values.client.name }}" release: {{ .Release.Name }} - {{- if .Values.client.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- if .Values.client.podAnnotations }} {{ toYaml .Values.client.podAnnotations | indent 8 }} {{- end }} spec: diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml index 02572aeb98..fd99c44a12 100644 --- a/stable/elasticsearch/templates/data-statefulset.yaml +++ b/stable/elasticsearch/templates/data-statefulset.yaml @@ -18,10 +18,15 @@ spec: component: "{{ .Values.data.name }}" release: {{ .Release.Name }} role: data - {{- if .Values.data.podAnnotations }} +{{- if or .Values.data.podAnnotations (eq .Values.data.updateStrategy.type "RollingUpdate") }} annotations: + {{- if .Values.data.podAnnotations }} {{ toYaml .Values.data.podAnnotations | indent 8 }} - {{- end }} + {{- end }} + {{- if eq .Values.data.updateStrategy.type "RollingUpdate" }} + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} +{{- end }} spec: {{- if .Values.schedulerName }} schedulerName: "{{ .Values.schedulerName }}" diff --git a/stable/elasticsearch/templates/master-statefulset.yaml b/stable/elasticsearch/templates/master-statefulset.yaml index c519a5d478..5cc7d3e3a9 100644 --- a/stable/elasticsearch/templates/master-statefulset.yaml +++ b/stable/elasticsearch/templates/master-statefulset.yaml @@ -18,10 +18,15 @@ spec: component: "{{ .Values.master.name }}" release: {{ .Release.Name }} role: master - {{- if .Values.master.podAnnotations }} +{{- if or .Values.master.podAnnotations (eq .Values.master.updateStrategy.type "RollingUpdate") }} annotations: + {{- if .Values.master.podAnnotations }} {{ toYaml .Values.master.podAnnotations | indent 8 }} - {{- end }} + {{- end }} + {{- if eq .Values.master.updateStrategy.type "RollingUpdate" }} + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} +{{- end }} spec: {{- if .Values.schedulerName }} schedulerName: "{{ .Values.schedulerName }}"