update defaulting for tiflash config

pingcap · Apr 5, 2020 · 127c46e · 127c46e
1 parent 400b248
commit 127c46e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 332 deletions.
diff --git a/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go b/pkg/apis/pingcap/v1alpha1/defaulting/tidbcluster.go
@@ -116,3 +116,11 @@ func setPumpSpecDefault(tc *v1alpha1.TidbCluster) {
 		}
 	}
 }
+
+func setTiFlashSpecDefault(tc *v1alpha1.TidbCluster) {
+	if len(tc.Spec.Version) > 0 || tc.Spec.TiFlash.Version != nil {
+		if tc.Spec.TiFlash.BaseImage == "" {
+			tc.Spec.TiFlash.BaseImage = defaultTiFlashImage
+		}
+	}
+}
diff --git a/pkg/apis/pingcap/v1alpha1/defaulting/tiflash.go b/pkg/apis/pingcap/v1alpha1/defaulting/tiflash.go