From 91843cecaf7aa6659c16edc8c24df40d43750839 Mon Sep 17 00:00:00 2001
From: luolibin <luolibin@pingcap.com>
Date: Tue, 30 Oct 2018 10:23:57 +0800
Subject: [PATCH] address comments

---
 charts/tidb-cluster/templates/drainer-configmap.yaml        | 2 +-
 charts/tidb-cluster/templates/drainer-statefulset.yaml      | 2 +-
 charts/tidb-cluster/templates/fullbackup-cronjob.yaml       | 2 +-
 charts/tidb-cluster/templates/monitor-configmap.yaml        | 6 +++---
 charts/tidb-cluster/templates/pd-configmap.yaml             | 4 ++--
 .../tidb-cluster/templates/privileged-tidb-configmap.yaml   | 4 ++--
 charts/tidb-cluster/templates/pump-configmap.yaml           | 2 +-
 charts/tidb-cluster/templates/pump-statefulset.yaml         | 2 +-
 charts/tidb-cluster/templates/tidb-configmap.yaml           | 4 ++--
 charts/tidb-cluster/templates/tikv-configmap.yaml           | 4 ++--
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/charts/tidb-cluster/templates/drainer-configmap.yaml b/charts/tidb-cluster/templates/drainer-configmap.yaml
index 9b60b6a5c75..6f18209635f 100644
--- a/charts/tidb-cluster/templates/drainer-configmap.yaml
+++ b/charts/tidb-cluster/templates/drainer-configmap.yaml
@@ -11,5 +11,5 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   drainer-config: |-
-{{ tuple "config/_drainer-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_drainer-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end -}}
diff --git a/charts/tidb-cluster/templates/drainer-statefulset.yaml b/charts/tidb-cluster/templates/drainer-statefulset.yaml
index 36d190a8f38..e402163d9ef 100644
--- a/charts/tidb-cluster/templates/drainer-statefulset.yaml
+++ b/charts/tidb-cluster/templates/drainer-statefulset.yaml
@@ -38,7 +38,7 @@ spec:
         - /bin/sh
         - -c
         - |-
-{{ tuple "scripts/_start_drainer.sh.tpl" . | include "tidb-cluster.utils.template" | indent 10 }}
+{{ tuple "scripts/_start_drainer.sh.tpl" . | include "helm-toolkit.utils.template" | indent 10 }}
         ports:
         - containerPort: 8249
           name: drainer
diff --git a/charts/tidb-cluster/templates/fullbackup-cronjob.yaml b/charts/tidb-cluster/templates/fullbackup-cronjob.yaml
index 476c4a58f7e..c369df01884 100644
--- a/charts/tidb-cluster/templates/fullbackup-cronjob.yaml
+++ b/charts/tidb-cluster/templates/fullbackup-cronjob.yaml
@@ -36,7 +36,7 @@ spec:
             - /bin/sh
             - -c
             - |-
-{{ tuple "scripts/_start_fullbackup.sh.tpl" . | include "tidb-cluster.utils.template" | indent 14 }}
+{{ tuple "scripts/_start_fullbackup.sh.tpl" . | include "helm-toolkit.utils.template" | indent 14 }}
             volumeMounts:
             - name: savepoint-dir
               mountPath: "/savepoint-dir"
diff --git a/charts/tidb-cluster/templates/monitor-configmap.yaml b/charts/tidb-cluster/templates/monitor-configmap.yaml
index 698dc8e09a4..e5a597e9fe1 100644
--- a/charts/tidb-cluster/templates/monitor-configmap.yaml
+++ b/charts/tidb-cluster/templates/monitor-configmap.yaml
@@ -11,11 +11,11 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   prometheus-config: |-
-{{ tuple "config/_prometheus-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_prometheus-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   alert-rules-config: |-
-{{ tuple "config/_alert-rules-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_alert-rules-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   grafana-config: |-
-{{ tuple "config/_grafana-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_grafana-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}
diff --git a/charts/tidb-cluster/templates/pd-configmap.yaml b/charts/tidb-cluster/templates/pd-configmap.yaml
index 52e12db1935..ba9cb5bb734 100644
--- a/charts/tidb-cluster/templates/pd-configmap.yaml
+++ b/charts/tidb-cluster/templates/pd-configmap.yaml
@@ -10,11 +10,11 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   startup-script: |-
-{{ tuple "scripts/_start_pd.sh.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "scripts/_start_pd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   config-file: |-
     {{- if .Values.pd.config }}
 {{ .Values.pd.config | indent 4 }}
     {{- else }}
-{{ tuple "config/_pd-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_pd-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
     {{- end -}}
diff --git a/charts/tidb-cluster/templates/privileged-tidb-configmap.yaml b/charts/tidb-cluster/templates/privileged-tidb-configmap.yaml
index 2e9dccb6b81..7df3f79930a 100644
--- a/charts/tidb-cluster/templates/privileged-tidb-configmap.yaml
+++ b/charts/tidb-cluster/templates/privileged-tidb-configmap.yaml
@@ -11,8 +11,8 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   startup-script: |-
-{{ tuple "scripts/_start_privileged_tidb.sh.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "scripts/_start_privileged_tidb.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   config-file: |-
-{{ tuple "config/_privileged-tidb-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_privileged-tidb-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}
diff --git a/charts/tidb-cluster/templates/pump-configmap.yaml b/charts/tidb-cluster/templates/pump-configmap.yaml
index b7a0199aacf..d5439e9fa4d 100644
--- a/charts/tidb-cluster/templates/pump-configmap.yaml
+++ b/charts/tidb-cluster/templates/pump-configmap.yaml
@@ -11,5 +11,5 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   pump-config: |-
-{{ tuple "config/_pump-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_pump-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end -}}
diff --git a/charts/tidb-cluster/templates/pump-statefulset.yaml b/charts/tidb-cluster/templates/pump-statefulset.yaml
index 0a85cd8ebc8..422c8926189 100644
--- a/charts/tidb-cluster/templates/pump-statefulset.yaml
+++ b/charts/tidb-cluster/templates/pump-statefulset.yaml
@@ -38,7 +38,7 @@ spec:
         - /bin/sh
         - -c
         - |-
-{{ tuple "scripts/_start_pump.sh.tpl" . | include "tidb-cluster.utils.template" | indent 10 }}
+{{ tuple "scripts/_start_pump.sh.tpl" . | include "helm-toolkit.utils.template" | indent 10 }}
         ports:
         - containerPort: 8250
           name: pump
diff --git a/charts/tidb-cluster/templates/tidb-configmap.yaml b/charts/tidb-cluster/templates/tidb-configmap.yaml
index da0ea933c4a..62a5d0e02be 100644
--- a/charts/tidb-cluster/templates/tidb-configmap.yaml
+++ b/charts/tidb-cluster/templates/tidb-configmap.yaml
@@ -10,11 +10,11 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   startup-script: |-
-{{ tuple "scripts/_start_tidb.sh.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "scripts/_start_tidb.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   config-file: |-
     {{- if .Values.tidb.config }}
 {{ .Values.tidb.config | indent 4 }}
     {{- else }}
-{{ tuple "config/_tidb-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_tidb-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
     {{- end -}}
diff --git a/charts/tidb-cluster/templates/tikv-configmap.yaml b/charts/tidb-cluster/templates/tikv-configmap.yaml
index b87dc0241f9..e7c907439ec 100644
--- a/charts/tidb-cluster/templates/tikv-configmap.yaml
+++ b/charts/tidb-cluster/templates/tikv-configmap.yaml
@@ -10,11 +10,11 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 data:
   startup-script: |-
-{{ tuple "scripts/_start_tikv.sh.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "scripts/_start_tikv.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
   config-file: |-
     {{- if .Values.tikv.config }}
 {{ .Values.tikv.config | indent 4 }}
     {{- else }}
-{{ tuple "config/_tikv-config.tpl" . | include "tidb-cluster.utils.template" | indent 4 }}
+{{ tuple "config/_tikv-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
     {{- end -}}