From 8e6d8394e089aef11412b0215805ae059491db05 Mon Sep 17 00:00:00 2001
From: Michael Russell <michael.russell@elastic.co>
Date: Wed, 18 Sep 2019 16:31:16 +0200
Subject: [PATCH] [elasticsearch] Drop version from chart label in service

As identified in #284 having the version in the label would cause the
service to be recreated during a chart version upgrade.
---
 elasticsearch/templates/configmap.yaml   | 2 +-
 elasticsearch/templates/service.yaml     | 6 +++---
 elasticsearch/templates/statefulset.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/elasticsearch/templates/configmap.yaml b/elasticsearch/templates/configmap.yaml
index 78074a804..7754178c7 100644
--- a/elasticsearch/templates/configmap.yaml
+++ b/elasticsearch/templates/configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     app: "{{ template "uname" . }}"
 data:
 {{- range $path, $config := .Values.esConfig }}
diff --git a/elasticsearch/templates/service.yaml b/elasticsearch/templates/service.yaml
index 8342bb65e..9c4439266 100644
--- a/elasticsearch/templates/service.yaml
+++ b/elasticsearch/templates/service.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     app: "{{ template "uname" . }}"
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}
@@ -15,7 +15,7 @@ spec:
   selector:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     app: "{{ template "uname" . }}"
   ports:
   - name: http
@@ -35,7 +35,7 @@ metadata:
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     app: "{{ template "uname" . }}"
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
index fbf8e6577..5a545a0cb 100644
--- a/elasticsearch/templates/statefulset.yaml
+++ b/elasticsearch/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     app: "{{ template "uname" . }}"
     {{- range $key, $value := .Values.labels }}
     {{ $key }}: {{ $value | quote }}
@@ -39,7 +39,7 @@ spec:
       labels:
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        chart: "{{ .Chart.Name }}"
         app: "{{ template "uname" . }}"
       annotations:
         {{- range $key, $value := .Values.podAnnotations }}