Keep the instance label of drainer same with the TiDB cluster in favo…

…r of monitoring (#1170) Signed-off-by: Aylei <rayingecho@gmail.com>
pingcap · Nov 18, 2019 · 245f372 · 245f372
1 parent 1012ab7
commit 245f372
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/charts/tidb-drainer/templates/drainer-configmap.yaml b/charts/tidb-drainer/templates/drainer-configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "drainer-configmap.name" . }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Values.clusterName }}
     app.kubernetes.io/component: drainer
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:

diff --git a/charts/tidb-drainer/templates/drainer-service.yaml b/charts/tidb-drainer/templates/drainer-service.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "drainer.name" . }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Values.clusterName }}
     app.kubernetes.io/component: drainer
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 spec:
@@ -15,5 +15,5 @@ spec:
     port: 8249
   selector:
     app.kubernetes.io/name: {{ include "drainer.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Values.clusterName }}
     app.kubernetes.io/component: drainer
diff --git a/charts/tidb-drainer/templates/drainer-statefulset.yaml b/charts/tidb-drainer/templates/drainer-statefulset.yaml
@@ -5,14 +5,14 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "drainer.name" . }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Values.clusterName }}
     app.kubernetes.io/component: drainer
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "drainer.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/instance: {{ .Values.clusterName }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/component: drainer
   serviceName: {{ include "drainer.name" . }}
@@ -25,7 +25,7 @@ spec:
         prometheus.io/port: "8249"
       labels:
         app.kubernetes.io/name: {{ include "drainer.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ .Values.clusterName }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/component: drainer
     spec: