4 files changed, 5 insertions, 19 deletions
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index bd508c57fd..72e1ba68e9 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 name: etcd
 home: https://github.com/coreos/etcd
-version: 13.0.1
+version: 13.0.2
 appVersion: 2.2.5
 description: Distributed reliable key-value store for the most critical data of a
   distributed system.
diff --git a/kubernetes/common/etcd/templates/pv.yaml b/kubernetes/common/etcd/templates/pv.yaml
index ac5b7b975d..a54850dad3 100644
--- a/kubernetes/common/etcd/templates/pv.yaml
+++ b/kubernetes/common/etcd/templates/pv.yaml
@@ -24,11 +24,7 @@ kind: PersistentVolume
 metadata:
   name: {{ include "common.fullname" $global }}-data-{{ $i }}
   namespace: {{ include "common.namespace" $global }}
-  labels:
-    app: {{ include "common.fullname" $global }}
-    chart: "{{ $global.Chart.Name }}-{{ $global.Chart.Version | replace "+" "_" }}"
-    release: "{{ include "common.release" $global }}"
-    heritage: "{{ $global.Release.Service }}"
+  labels: {{- include "common.labels" $global | nindent 4 }}
     name: {{ include "common.fullname" $global }}
 spec:
   capacity:
diff --git a/kubernetes/common/etcd/templates/service.yaml b/kubernetes/common/etcd/templates/service.yaml
index 72dea06832..c5993934fd 100644
--- a/kubernetes/common/etcd/templates/service.yaml
+++ b/kubernetes/common/etcd/templates/service.yaml
@@ -20,11 +20,7 @@ metadata:
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
   name: {{ include "common.servicename" .  }}
-  labels:
-    heritage: "{{ .Release.Service  }}"
-    release: "{{ include "common.release" .  }}"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ include "common.name" . }}
+  labels: {{- include "common.labels" . | nindent 4 }}
 spec:
   ports:
   - name: {{ .Values.service.peerPortName }}
@@ -32,6 +28,4 @@ spec:
   - name: {{ .Values.service.clientPortName }}
     port: {{ .Values.service.clientInternalPort }}
   clusterIP: None
-  selector:
-    app.kubernetes.io/name: {{ include "common.name" . }}
-    app.kubernetes.io/instance: {{ include "common.release" . }}
+  selector: {{- include "common.matchLabels" . | nindent 4 }}
diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index c71d3295eb..f2e04c992d 100644
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -212,11 +212,7 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: {{ include "common.fullname" . }}-data
-      labels:
-        name: {{ include "common.fullname" . }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        release: "{{ include "common.release" . }}"
-        heritage: "{{ .Release.Service }}"
+      labels: {{- include "common.labels" . | nindent 8 }}
     spec:
       accessModes:
       - "{{ .Values.persistence.accessMode }}"