From c21e90db9f14f40f80e5fdcceb339548b4b9c9f0 Mon Sep 17 00:00:00 2001
From: weekface <weekface@gmail.com>
Date: Tue, 23 Apr 2019 14:57:39 +0800
Subject: [PATCH] fix operator chart issue

---
 .../tidb-operator/templates/controller-manager-deployment.yaml  | 1 +
 charts/tidb-operator/templates/scheduler-deployment.yaml        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/charts/tidb-operator/templates/controller-manager-deployment.yaml b/charts/tidb-operator/templates/controller-manager-deployment.yaml
index 26da20a3df..e61bae0a0e 100644
--- a/charts/tidb-operator/templates/controller-manager-deployment.yaml
+++ b/charts/tidb-operator/templates/controller-manager-deployment.yaml
@@ -37,6 +37,7 @@ spec:
           - -cluster-scoped={{ .Values.clusterScoped }}
           - -auto-failover={{ .Values.controllerManager.autoFailover | default false }}
           - -pd-failover-period={{ .Values.controllerManager.pdFailoverPeriod | default "5m" }}
+          - -tikv-failover-period={{ .Values.controllerManager.tikvFailoverPeriod | default "5m" }}
           - -tidb-failover-period={{ .Values.controllerManager.tidbFailoverPeriod | default "5m" }}
           - -v={{ .Values.controllerManager.logLevel }}
         env:
diff --git a/charts/tidb-operator/templates/scheduler-deployment.yaml b/charts/tidb-operator/templates/scheduler-deployment.yaml
index 6d63bc1f37..2e1e71c93a 100644
--- a/charts/tidb-operator/templates/scheduler-deployment.yaml
+++ b/charts/tidb-operator/templates/scheduler-deployment.yaml
@@ -28,6 +28,7 @@ spec:
       containers:
       - name: {{ .Values.scheduler.schedulerName }}
         image: {{ .Values.operatorImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
         resources:
 {{ toYaml .Values.scheduler.resources | indent 12 }}
         command:
@@ -36,6 +37,7 @@ spec:
           - -port=10262
       - name: kube-scheduler
         image: {{ required "scheduler.kubeSchedulerImageName is required" .Values.scheduler.kubeSchedulerImageName }}:{{ .Values.scheduler.kubeSchedulerImageTag | default (split "-" .Capabilities.KubeVersion.GitVersion)._0 }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
         resources:
 {{ toYaml .Values.scheduler.resources | indent 12 }}
         command: