From aac319f084cdb110306d0dff692ee5962a32b63b Mon Sep 17 00:00:00 2001
From: Song Gao <2695690803@qq.com>
Date: Wed, 11 Mar 2020 10:57:59 +0800
Subject: [PATCH] improve note and revise idc config

---
 charts/tidb-operator/values.yaml       | 6 ++++--
 ci/deploy_tidb_operator_staging.groovy | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml
index 576caa6a95..dd54254ecd 100644
--- a/charts/tidb-operator/values.yaml
+++ b/charts/tidb-operator/values.yaml
@@ -205,9 +205,11 @@ admissionWebhook:
   ## failurePolicy are applied to ValidatingWebhookConfiguration which affect tidb-admission-webhook
   ## refer to https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#failure-policy
   failurePolicy:
-    ## the validation webhook would check the request of the given resources, and the failurePolicy is recommended as Ignore
+    ## the validation webhook would check the request of the given resources.
+    ## If the kubernetes api-server version >= 1.15.0, we recommend the failurePolicy as Fail, otherwise, as Ignore.
     validation: Ignore
-    ## the mutation webhook would mutate the request of the given resources, and the failurePolicy is recommended as Ignore
+    ## the mutation webhook would mutate the request of the given resources.
+    ## If the kubernetes api-server version >= 1.15.0, we recommend the failurePolicy as Fail, otherwise, as Ignore.
     mutation: Ignore
   ## tidb-admission-webhook deployed as kubernetes apiservice server
   ## refer to https://github.com/openshift/generic-admission-server
diff --git a/ci/deploy_tidb_operator_staging.groovy b/ci/deploy_tidb_operator_staging.groovy
index 90d52a6c1a..17b8b8b3cd 100644
--- a/ci/deploy_tidb_operator_staging.groovy
+++ b/ci/deploy_tidb_operator_staging.groovy
@@ -23,12 +23,16 @@ scheduler:
   replicas: 2
 admissionWebhook:
   create: true
+  replicas: 2
   validation:
     statefulSets: true
     pods: true
     pingcapResources: false
   mutation:
     pingcapResources: true
+  failurePolicy:
+    validation: Fail
+    mutation: Fail
 features:
   - AutoScaling=true
 '''