Improve note of failurePolicy and revise IDC configuration (#1904) (#…

…1907)
pingcap · Mar 11, 2020 · 51bba74 · 51bba74
1 parent d3b556d
commit 51bba74
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
 '''