Merge branch 'master' into fix1819

pingcap · Mar 2, 2020 · f391b5b · f391b5b
2 parents ac8d60a + 9b69f6d
commit f391b5b
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 13 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/cmd/admission-webhook/main.go b/cmd/admission-webhook/main.go
@@ -19,11 +19,11 @@ import (
 	"time"
 
 	"github.com/openshift/generic-admission-server/pkg/cmd"
-
 	"github.com/pingcap/tidb-operator/pkg/features"
 	"github.com/pingcap/tidb-operator/pkg/version"
 	"github.com/pingcap/tidb-operator/pkg/webhook"
 	"k8s.io/component-base/logs"
+	"k8s.io/klog"
 )
 
 var (
@@ -51,6 +51,10 @@ func main() {
 	}
 	version.LogVersionInfo()
 
+	flag.CommandLine.VisitAll(func(flag *flag.Flag) {
+		klog.V(1).Infof("FLAG: --%s=%q", flag.Name, flag.Value)
+	})
+
 	ah := &webhook.AdmissionHook{
 		ExtraServiceAccounts:     extraServiceAccounts,
 		EvictRegionLeaderTimeout: evictRegionLeaderTimeout,

diff --git a/cmd/controller-manager/main.go b/cmd/controller-manager/main.go
@@ -93,6 +93,10 @@ func main() {
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
+	flag.CommandLine.VisitAll(func(flag *flag.Flag) {
+		klog.V(1).Infof("FLAG: --%s=%q", flag.Name, flag.Value)
+	})
+
 	hostName, err := os.Hostname()
 	if err != nil {
 		klog.Fatalf("failed to get hostname: %v", err)

diff --git a/cmd/discovery/main.go b/cmd/discovery/main.go
@@ -52,6 +52,10 @@ func main() {
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
+	flag.CommandLine.VisitAll(func(flag *flag.Flag) {
+		klog.V(1).Infof("FLAG: --%s=%q", flag.Name, flag.Value)
+	})
+
 	cfg, err := rest.InClusterConfig()
 	if err != nil {
 		klog.Fatalf("failed to get config: %v", err)

diff --git a/cmd/scheduler/main.go b/cmd/scheduler/main.go
@@ -54,6 +54,10 @@ func main() {
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
+	flag.CommandLine.VisitAll(func(flag *flag.Flag) {
+		klog.V(1).Infof("FLAG: --%s=%q", flag.Name, flag.Value)
+	})
+
 	cfg, err := rest.InClusterConfig()
 	if err != nil {
 		klog.Fatalf("failed to get config: %v", err)

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
 	}
 }