enable defaulting (#1821)

Co-authored-by: Song Gao <disxiaofei@163.com>
pingcap · Mar 2, 2020 · 88aabbc · 88aabbc
1 parent 4b324f2
commit 88aabbc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 12 deletions.
diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml
@@ -195,7 +195,7 @@ admissionWebhook:
     ## validating hook validates the correctness of the resources under pingcap.com group
     validating: false
     ## defaulting hook set default values for the the resources under pingcap.com group
-    defaulting: false
+    defaulting: true
   ## 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:

diff --git a/ci/deploy_tidb_operator_staging.groovy b/ci/deploy_tidb_operator_staging.groovy
@@ -28,7 +28,7 @@ admissionWebhook:
     pods: true
     # TODO: enable validating and defaulting after we ease the constrain
     validating: false
-    defaulting: false
+    defaulting: true
 features:
   - AutoScaling=true
 '''

diff --git a/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go b/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go
@@ -26,28 +26,59 @@ const (
 )
 
 func SetTidbClusterDefault(tc *v1alpha1.TidbCluster) {
-	if tc.Spec.TiDB.BaseImage == "" {
-		tc.Spec.TiDB.BaseImage = defaultTiDBImage
+	setTidbClusterSpecDefault(tc)
+	setPdSpecDefault(tc)
+	setTikvSpecDefault(tc)
+	setTidbSpecDefault(tc)
+	if tc.Spec.Pump != nil {
+		setPumpSpecDefault(tc)
 	}
-	if tc.Spec.TiKV.BaseImage == "" {
-		tc.Spec.TiKV.BaseImage = defaultTiKVImage
+}
+
+// setTidbClusterSpecDefault is only managed the property under Spec
+func setTidbClusterSpecDefault(tc *v1alpha1.TidbCluster) {
+	if string(tc.Spec.ImagePullPolicy) == "" {
+		tc.Spec.ImagePullPolicy = corev1.PullIfNotPresent
 	}
-	if tc.Spec.PD.BaseImage == "" {
-		tc.Spec.PD.BaseImage = defaultPDImage
+	if tc.Spec.EnableTLSCluster == nil {
+		d := false
+		tc.Spec.EnableTLSCluster = &d
 	}
-	if tc.Spec.Pump != nil && tc.Spec.Pump.BaseImage == "" {
-		tc.Spec.Pump.BaseImage = defaultBinlogImage
+	if tc.Spec.EnablePVReclaim == nil {
+		d := false
+		tc.Spec.EnablePVReclaim = &d
+	}
+}
+
+func setTidbSpecDefault(tc *v1alpha1.TidbCluster) {
+	if tc.Spec.TiDB.BaseImage == "" {
+		tc.Spec.TiDB.BaseImage = defaultTiDBImage
 	}
 	if tc.Spec.TiDB.Config == nil {
 		tc.Spec.TiDB.Config = &v1alpha1.TiDBConfig{}
 	}
+}
+
+func setTikvSpecDefault(tc *v1alpha1.TidbCluster) {
 	if tc.Spec.TiKV.Config == nil {
 		tc.Spec.TiKV.Config = &v1alpha1.TiKVConfig{}
 	}
+	if tc.Spec.TiKV.BaseImage == "" {
+		tc.Spec.TiKV.BaseImage = defaultTiKVImage
+	}
+}
+
+func setPdSpecDefault(tc *v1alpha1.TidbCluster) {
 	if tc.Spec.PD.Config == nil {
 		tc.Spec.PD.Config = &v1alpha1.PDConfig{}
 	}
-	if string(tc.Spec.ImagePullPolicy) == "" {
-		tc.Spec.ImagePullPolicy = corev1.PullIfNotPresent
+	if tc.Spec.PD.BaseImage == "" {
+		tc.Spec.PD.BaseImage = defaultPDImage
+	}
+}
+
+func setPumpSpecDefault(tc *v1alpha1.TidbCluster) {
+	if tc.Spec.Pump.BaseImage == "" {
+		tc.Spec.Pump.BaseImage = defaultBinlogImage
 	}
 }