From 87aa7fbaf2577fefe921d2da33f3d420b7c5f4f7 Mon Sep 17 00:00:00 2001
From: Song Gao <2695690803@qq.com>
Date: Wed, 4 Mar 2020 10:46:37 +0800
Subject: [PATCH] fix tidb defaulting

---
 pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go b/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go
index 6704bb2d55..a3ce0d6852 100644
--- 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
 		}
 	}
 }