add new function to get image for init container

pingcap · Nov 7, 2019 · eb6b0b2 · eb6b0b2
1 parent 063d760
commit eb6b0b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go
@@ -201,6 +201,14 @@ func TiKVCapacity(limits *v1alpha1.ResourceRequirement) string {
 	return fmt.Sprintf("%dMB", i/humanize.MiByte)
 }
 
+// Reuse the SlowLogTailer image for TiDB
+func GetUtilImage(cluster *v1alpha1.TidbCluster) string {
+        if img := cluster.Spec.TiDB.SlowLogTailer.Image; img != "" {
+                return img
+        }
+        return defaultTiDBLogTailerImage
+}
+
 func GetSlowLogTailerImage(cluster *v1alpha1.TidbCluster) string {
 	if img := cluster.Spec.TiDB.SlowLogTailer.Image; img != "" {
 		return img

diff --git a/pkg/manager/member/tidb_member_manager.go b/pkg/manager/member/tidb_member_manager.go
@@ -278,7 +278,7 @@ func getNewTiDBSetForTidbCluster(tc *v1alpha1.TidbCluster) *apps.StatefulSet {
 				privileged := true
 				initContainers = append(initContainers, corev1.Container{
 					Name:  "init",
-					Image: controller.GetSlowLogTailerImage(tc),
+					Image: controller.GetUtilImage(tc),
 					Command: []string{
 						"sh",
 						"-c",

diff --git a/pkg/manager/member/tikv_member_manager.go b/pkg/manager/member/tikv_member_manager.go
@@ -327,7 +327,7 @@ func getNewTiKVSetForTidbCluster(tc *v1alpha1.TidbCluster) (*apps.StatefulSet, e
 				privileged := true
 				initContainers = append(initContainers, corev1.Container{
 					Name:  "init",
-					Image: controller.GetSlowLogTailerImage(tc),
+					Image: controller.GetUtilImage(tc),
 					Command: []string{
 						"sh",
 						"-c",