fix scheduler policy issue (#256)

* fix scheduler policy issue
pingcap · Dec 28, 2018 · b34ecb0 · b34ecb0
1 parent 4b469da
commit b34ecb0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/charts/tidb-operator/templates/config/_scheduler-policy-json.tpl b/charts/tidb-operator/templates/config/_scheduler-policy-json.tpl
@@ -11,13 +11,13 @@
     {"name": "CheckVolumeBinding"},
     {"name": "MaxGCEPDVolumeCount"},
     {"name": "MatchInterPodAffinity"},
-    {"name": "CheckNodeMemoryPressure"},
-    {"name": "CheckNodeDiskPressure"},
-{{- if semverCompare ">=1.11-0" .Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare "~1.11.0" .Capabilities.KubeVersion.GitVersion }}
     {"name": "CheckNodePIDPressure"},
 {{- end }}
 {{- if semverCompare "<1.12-0" .Capabilities.KubeVersion.GitVersion }}
     {"name": "CheckNodeCondition"},
+    {"name": "CheckNodeMemoryPressure"},
+    {"name": "CheckNodeDiskPressure"},
 {{- end }}
     {"name": "CheckVolumeBinding"}
   ],

diff --git a/charts/tidb-operator/templates/scheduler-deployment.yaml b/charts/tidb-operator/templates/scheduler-deployment.yaml
@@ -35,7 +35,7 @@ spec:
           - -v={{ .Values.scheduler.logLevel }}
           - -port=10262
       - name: kube-scheduler
-        image: {{ .Values.scheduler.kubeSchedulerImage }}
+        image: {{ required "scheduler.kubeSchedulerImage is required! Its verison must be the same as your kubernetes cluster version" .Values.scheduler.kubeSchedulerImage }}
         resources:
 {{ toYaml .Values.scheduler.resources | indent 12 }}
         command:

diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml
@@ -50,5 +50,5 @@ scheduler:
     requests:
       cpu: 80m
       memory: 50Mi
-  # modify the hyperkube verison to your kubernetes version
-  kubeSchedulerImage: gcr.io/google-containers/hyperkube:v1.10.12
+  # this hyperkube verison must be the same as your kubernetes cluster version
+  # kubeSchedulerImage: gcr.io/google-containers/hyperkube:v1.12.1
diff --git a/docs/aws-eks-tutorial.md b/docs/aws-eks-tutorial.md
@@ -331,6 +331,8 @@ connect onto your newly created cluster.
 
 TiDB Operator manages TiDB clusters on Kubernetes and automates tasks related to operating a TiDB cluster. It makes TiDB a truly cloud-native database.
 
+Uncomment the `scheduler.kubeSchedulerImage` in `values.yaml`, set it to the same as your kubernetes cluster version.
+
 If you already have helm installed, you can continue here to deploy tidb-operator:
 
 ```sh

diff --git a/docs/google-kubernetes-tutorial.md b/docs/google-kubernetes-tutorial.md
@@ -93,9 +93,10 @@ When you see `Running`, it's time to hit `Control + C` and proceed to the next s
 
 The first TiDB component we are going to install is the TiDB Operator, using a Helm Chart. TiDB Operator is the management system that works with Kubernetes to bootstrap your TiDB cluster and keep it running. This step assumes you are in the `tidb-operator` working directory:
 
+	KUBE_VERSION=$(kubectl version --short | awk '/Server/{print $NF}' | awk -F '-' '{print $1}') &&
 	kubectl apply -f ./manifests/crd.yaml &&
 	kubectl apply -f ./manifests/gke-storage.yml &&
-	helm install ./charts/tidb-operator -n tidb-admin --namespace=tidb-admin
+	helm install ./charts/tidb-operator -n tidb-admin --namespace=tidb-admin --set scheduler.kubeSchedulerImage=gcr.io/google-containers/hyperkube:${KUBE_VERSION}
 
 We can watch the operator come up with:
 

diff --git a/docs/local-dind-tutorial.md b/docs/local-dind-tutorial.md
@@ -37,6 +37,8 @@ $ KUBE_REPO_PREFIX=uhub.ucloud.cn/pingcap manifests/local-dind/dind-cluster-v1.1
 
 ## Step 2: Install TiDB Operator in the DinD Kubernetes cluster
 
+Uncomment the `scheduler.kubeSchedulerImage` in `values.yaml`, set it to the same as your kubernetes cluster version.
+
 ```sh
 $ kubectl apply -f manifests/crd.yaml
 

diff --git a/docs/setup.md b/docs/setup.md
@@ -83,6 +83,8 @@ $ kubectl get crd tidbclusters.pingcap.com
 
 After the `TidbCluster` custom resource is created, you can install TiDB Operator in your Kubernetes cluster.
 
+Uncomment the `scheduler.kubeSchedulerImage` in `values.yaml`, set it to the same as your kubernetes cluster version.
+
 ```shell
 $ helm install charts/tidb-operator --name=tidb-operator --namespace=tidb-admin
 $ kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
-Original file line number
+Diff line change
@@ Expand Up / @@ -331,6 +331,8 @@ connect onto your newly created cluster. @@
     TiDB Operator manages TiDB clusters on Kubernetes and automates tasks related to operating a TiDB cluster. It makes TiDB a truly cloud-native database.
+    Uncomment the `scheduler.kubeSchedulerImage` in `values.yaml`, set it to the same as your kubernetes cluster version.
     If you already have helm installed, you can continue here to deploy tidb-operator:
     ```sh
@@ Expand Down @@