fix tidb defaulting (pingcap#1865)

Co-authored-by: Song Gao <disxiaofei@163.com>
Yisaer · Mar 5, 2020 · 0d11094 · 0d11094
1 parent 36af5ba
commit 0d11094
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go b/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go
@@ -51,12 +51,12 @@ func setTidbClusterSpecDefault(tc *v1alpha1.TidbCluster) {
 }
 
 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{}
 	}
 	if len(tc.Spec.Version) > 0 || tc.Spec.TiDB.Version != nil {
-		if tc.Spec.TiDB.Config == nil {
-			tc.Spec.TiDB.Config = &v1alpha1.TiDBConfig{}
+		if tc.Spec.TiDB.BaseImage == "" {
+			tc.Spec.TiDB.BaseImage = defaultTiDBImage
 		}
 	}
 }