Merge pull request #447 from runkecheng/feature_use_cm_save_xenon_metadata

andyli029 · web-flow · commit 58d822a48e26 · 2022-04-13T19:19:56.000+08:00
*: Save Xenon's metadata to config map.
diff --git a/controllers/mysqlcluster_controller.go b/controllers/mysqlcluster_controller.go
@@ -99,8 +99,8 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 	}()
 
-	configMapSyncer := clustersyncer.NewConfigMapSyncer(r.Client, instance)
-	if err = syncer.Sync(ctx, configMapSyncer, r.Recorder); err != nil {
+	mysqlCMSyncer := clustersyncer.NewMysqlCMSyncer(r.Client, instance)
+	if err = syncer.Sync(ctx, mysqlCMSyncer, r.Recorder); err != nil {
 		return ctrl.Result{}, err
 	}
 
@@ -109,7 +109,8 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{}, err
 	}
 
-	cmRev := configMapSyncer.Object().(*corev1.ConfigMap).ResourceVersion
+	// Todo: modify mysql cm will trigger rolling update but it will not be applied.
+	cmRev := mysqlCMSyncer.Object().(*corev1.ConfigMap).ResourceVersion
 	sctRev := secretSyncer.Object().(*corev1.Secret).ResourceVersion
 
 	r.XenonExecutor.SetRootPassword(instance.Spec.MysqlOpts.RootPassword)
@@ -124,6 +125,7 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		clustersyncer.NewFollowerSVCSyncer(r.Client, instance),
 		clustersyncer.NewStatefulSetSyncer(r.Client, instance, cmRev, sctRev, r.SQLRunnerFactory, r.XenonExecutor),
 		clustersyncer.NewPDBSyncer(r.Client, instance),
+		clustersyncer.NewXenonCMSyncer(r.Client, instance),
 	}
 
 	if instance.Spec.MetricsOpts.Enabled {
diff --git a/mysqlcluster/container/backup.go b/mysqlcluster/container/backup.go
@@ -128,13 +128,12 @@ func (c *backupSidecar) getReadinessProbe() *corev1.Probe {
 func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {
 	return []corev1.VolumeMount{
 		{
-			Name:      utils.ConfVolumeName,
-			MountPath: utils.ConfVolumeMountPath,
+			Name:      utils.MysqlConfVolumeName,
+			MountPath: utils.MysqlConfVolumeMountPath,
 		},
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
-			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/init_mysql.go b/mysqlcluster/container/init_mysql.go
@@ -110,13 +110,12 @@ func (c *initMysql) getReadinessProbe() *corev1.Probe {
 func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {
 	return []corev1.VolumeMount{
 		{
-			Name:      utils.ConfVolumeName,
-			MountPath: utils.ConfVolumeMountPath,
+			Name:      utils.MysqlConfVolumeName,
+			MountPath: utils.MysqlConfVolumeMountPath,
 		},
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
-			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/init_mysql_test.go b/mysqlcluster/container/init_mysql_test.go
@@ -53,13 +53,12 @@ var (
 	}
 	initMysqlVolumeMounts = []corev1.VolumeMount{
 		{
-			Name:      utils.ConfVolumeName,
-			MountPath: utils.ConfVolumeMountPath,
+			Name:      utils.MysqlConfVolumeName,
+			MountPath: utils.MysqlConfVolumeMountPath,
 		},
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
-			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/init_sidecar.go b/mysqlcluster/container/init_sidecar.go
@@ -163,20 +163,28 @@ func (c *initSidecar) getReadinessProbe() *corev1.Probe {
 func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      utils.ConfVolumeName,
-			MountPath: utils.ConfVolumeMountPath,
+			Name:      utils.MysqlConfVolumeName,
+			MountPath: utils.MysqlConfVolumeMountPath,
 		},
 		{
-			Name:      utils.ConfMapVolumeName,
-			MountPath: utils.ConfMapVolumeMountPath,
+			Name:      utils.MysqlCMVolumeName,
+			MountPath: utils.MysqlCMVolumeMountPath,
+		},
+		{
+			Name:      utils.XenonCMVolumeName,
+			MountPath: utils.XenonCMVolumeMountPath,
+		},
+		{
+			Name:      utils.XenonMetaVolumeName,
+			MountPath: utils.XenonMetaVolumeMountPath,
 		},
 		{
 			Name:      utils.ScriptsVolumeName,
 			MountPath: utils.ScriptsVolumeMountPath,
 		},
 		{
-			Name:      utils.XenonVolumeName,
-			MountPath: utils.XenonVolumeMountPath,
+			Name:      utils.XenonConfVolumeName,
+			MountPath: utils.XenonConfVolumeMountPath,
 		},
 		{
 			Name:      utils.InitFileVolumeName,
@@ -202,12 +210,6 @@ func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {
 			corev1.VolumeMount{
 				Name:      utils.DataVolumeName,
 				MountPath: utils.DataVolumeMountPath,
-				SubPath:   utils.MysqlDataSubPath,
-			},
-			corev1.VolumeMount{
-				Name:      utils.DataVolumeName,
-				MountPath: utils.XenonDataVolumeMountPath,
-				SubPath:   utils.XenonDataSubPath,
 			},
 		)
 	}
diff --git a/mysqlcluster/container/init_sidecar_test.go b/mysqlcluster/container/init_sidecar_test.go
@@ -272,20 +272,28 @@ var (
 	}
 	defaultInitsidecarVolumeMounts = []corev1.VolumeMount{
 		{
-			Name:      utils.ConfVolumeName,
-			MountPath: utils.ConfVolumeMountPath,
+			Name:      utils.MysqlConfVolumeName,
+			MountPath: utils.MysqlConfVolumeMountPath,
 		},
 		{
-			Name:      utils.ConfMapVolumeName,
-			MountPath: utils.ConfMapVolumeMountPath,
+			Name:      utils.MysqlCMVolumeName,
+			MountPath: utils.MysqlCMVolumeMountPath,
+		},
+		{
+			Name:      utils.XenonCMVolumeName,
+			MountPath: utils.XenonCMVolumeMountPath,
+		},
+		{
+			Name:      utils.XenonMetaVolumeName,
+			MountPath: utils.XenonMetaVolumeMountPath,
 		},
 		{
 			Name:      utils.ScriptsVolumeName,
 			MountPath: utils.ScriptsVolumeMountPath,
 		},
 		{
-			Name:      utils.XenonVolumeName,
-			MountPath: utils.XenonVolumeMountPath,
+			Name:      utils.XenonConfVolumeName,
+			MountPath: utils.XenonConfVolumeMountPath,
 		},
 		{
 			Name:      utils.InitFileVolumeName,
@@ -437,7 +445,7 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 			MysqlCluster: &testToKuDBMysqlCluster,
 		}
 		tokudbCase := EnsureContainer("init-sidecar", &testTokuDBCluster)
-		tokuDBVolumeMounts := make([]corev1.VolumeMount, 6, 7)
+		tokuDBVolumeMounts := make([]corev1.VolumeMount, 8, 9)
 		copy(tokuDBVolumeMounts, defaultInitsidecarVolumeMounts)
 		tokuDBVolumeMounts = append(tokuDBVolumeMounts, corev1.VolumeMount{
 			Name:      utils.SysVolumeName,
@@ -453,20 +461,12 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 			MysqlCluster: &testPersistenceMysqlCluster,
 		}
 		persistenceCase := EnsureContainer("init-sidecar", &testPersistenceCluster)
-		persistenceVolumeMounts := make([]corev1.VolumeMount, 6, 7)
+		persistenceVolumeMounts := make([]corev1.VolumeMount, 8, 9)
 		copy(persistenceVolumeMounts, defaultInitsidecarVolumeMounts)
-		persistenceVolumeMounts = append(persistenceVolumeMounts,
-			corev1.VolumeMount{
-				Name:      utils.DataVolumeName,
-				MountPath: utils.DataVolumeMountPath,
-				SubPath:   utils.MysqlDataSubPath,
-			},
-			corev1.VolumeMount{
-				Name:      utils.DataVolumeName,
-				MountPath: utils.XenonDataVolumeMountPath,
-				SubPath:   utils.XenonDataSubPath,
-			},
-		)
+		persistenceVolumeMounts = append(persistenceVolumeMounts, corev1.VolumeMount{
+			Name:      utils.DataVolumeName,
+			MountPath: utils.DataVolumeMountPath,
+		})
 		assert.Equal(t, persistenceVolumeMounts, persistenceCase.VolumeMounts)
 	}
 }
diff --git a/mysqlcluster/container/mysql.go b/mysqlcluster/container/mysql.go
@@ -135,13 +135,12 @@ func (c *mysql) getReadinessProbe() *corev1.Probe {
 func (c *mysql) getVolumeMounts() []corev1.VolumeMount {
 	return []corev1.VolumeMount{
 		{
-			Name:      utils.ConfVolumeName,
-			MountPath: utils.ConfVolumeMountPath,
+			Name:      utils.MysqlConfVolumeName,
+			MountPath: utils.MysqlConfVolumeMountPath,
 		},
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
-			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/mysql_test.go b/mysqlcluster/container/mysql_test.go
@@ -141,13 +141,12 @@ func TestGetMysqlReadinessProbe(t *testing.T) {
 func TestGetMysqlVolumeMounts(t *testing.T) {
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "conf",
+			Name:      "mysql-conf",
 			MountPath: "/etc/mysql",
 		},
 		{
 			Name:      "data",
 			MountPath: "/var/lib/mysql",
-			SubPath:   "mysql",
 		},
 		{
 			Name:      "logs",
diff --git a/mysqlcluster/container/xenon.go b/mysqlcluster/container/xenon.go
@@ -115,13 +115,12 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {
 			MountPath: utils.ScriptsVolumeMountPath,
 		},
 		{
-			Name:      utils.DataVolumeName,
-			MountPath: utils.XenonDataVolumeMountPath,
-			SubPath:   utils.XenonDataSubPath,
+			Name:      utils.XenonConfVolumeName,
+			MountPath: utils.XenonConfVolumeMountPath,
 		},
 		{
-			Name:      utils.XenonVolumeName,
-			MountPath: utils.XenonVolumeMountPath,
+			Name:      utils.XenonMetaVolumeName,
+			MountPath: utils.XenonMetaVolumeMountPath,
 		},
 		{
 			Name:      utils.SysLocalTimeZone,
diff --git a/mysqlcluster/container/xenon_test.go b/mysqlcluster/container/xenon_test.go
@@ -135,13 +135,12 @@ func TestGetXenonVolumeMounts(t *testing.T) {
 			MountPath: "/scripts",
 		},
 		{
-			Name:      "data",
-			MountPath: "/var/lib/xenon",
-			SubPath:   "xenon",
+			Name:      "xenon-conf",
+			MountPath: "/etc/xenon",
 		},
 		{
-			Name:      "xenon",
-			MountPath: "/etc/xenon",
+			Name:      "xenon-meta",
+			MountPath: "/var/lib/xenon",
 		},
 		{
 			Name:      utils.SysLocalTimeZone,
diff --git a/mysqlcluster/mysqlcluster.go b/mysqlcluster/mysqlcluster.go
@@ -193,7 +193,7 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
 
 	volumes = append(volumes,
 		corev1.Volume{
-			Name: utils.ConfVolumeName,
+			Name: utils.MysqlConfVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
@@ -205,7 +205,7 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
 			},
 		},
 		corev1.Volume{
-			Name: utils.ConfMapVolumeName,
+			Name: utils.MysqlCMVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
@@ -214,14 +214,30 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
 				},
 			},
 		},
+		corev1.Volume{
+			Name: utils.XenonCMVolumeName,
+			VolumeSource: corev1.VolumeSource{
+				ConfigMap: &corev1.ConfigMapVolumeSource{
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: c.GetNameForResource(utils.XenonMetaData),
+					},
+				},
+			},
+		},
+		corev1.Volume{
+			Name: utils.XenonMetaVolumeName,
+			VolumeSource: corev1.VolumeSource{
+				EmptyDir: &corev1.EmptyDirVolumeSource{},
+			},
+		},
 		corev1.Volume{
 			Name: utils.ScriptsVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
 		corev1.Volume{
-			Name: utils.XenonVolumeName,
+			Name: utils.XenonConfVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
@@ -294,6 +310,8 @@ func (c *MysqlCluster) GetNameForResource(name utils.ResourceName) string {
 		return fmt.Sprintf("%s-metrics", c.Name)
 	case utils.Secret:
 		return fmt.Sprintf("%s-secret", c.Name)
+	case utils.XenonMetaData:
+		return fmt.Sprintf("%s-xenon", c.Name)
 	default:
 		return c.Name
 	}
diff --git a/mysqlcluster/mysqlcluster_test.go b/mysqlcluster/mysqlcluster_test.go
@@ -245,7 +245,7 @@ func TestGetPodHostName(t *testing.T) {
 func TestEnsureVolumes(t *testing.T) {
 	volume := []corev1.Volume{
 		{
-			Name: utils.ConfVolumeName,
+			Name: utils.MysqlConfVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
@@ -257,7 +257,7 @@ func TestEnsureVolumes(t *testing.T) {
 			},
 		},
 		{
-			Name: utils.ConfMapVolumeName,
+			Name: utils.MysqlCMVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
@@ -266,14 +266,30 @@ func TestEnsureVolumes(t *testing.T) {
 				},
 			},
 		},
+		{
+			Name: utils.XenonCMVolumeName,
+			VolumeSource: corev1.VolumeSource{
+				ConfigMap: &corev1.ConfigMapVolumeSource{
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: "sample-xenon",
+					},
+				},
+			},
+		},
+		{
+			Name: utils.XenonMetaVolumeName,
+			VolumeSource: corev1.VolumeSource{
+				EmptyDir: &corev1.EmptyDirVolumeSource{},
+			},
+		},
 		{
 			Name: utils.ScriptsVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
 		{
-			Name: utils.XenonVolumeName,
+			Name: utils.XenonConfVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
diff --git a/mysqlcluster/syncer/mysql_cm.go b/mysqlcluster/syncer/mysql_cm.go
@@ -31,8 +31,8 @@ import (
 	"github.com/radondb/radondb-mysql-kubernetes/utils"
 )
 
-// NewConfigMapSyncer returns configmap syncer.
-func NewConfigMapSyncer(cli client.Client, c *mysqlcluster.MysqlCluster) syncer.Interface {
+// NewMysqlCMSyncer returns mysql configmap syncer.
+func NewMysqlCMSyncer(cli client.Client, c *mysqlcluster.MysqlCluster) syncer.Interface {
 	cm := &corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
diff --git a/mysqlcluster/syncer/xenon_cm.go b/mysqlcluster/syncer/xenon_cm.go
diff --git a/sidecar/config.go b/sidecar/config.go
diff --git a/sidecar/init.go b/sidecar/init.go
diff --git a/sidecar/util.go b/sidecar/util.go
diff --git a/utils/constants.go b/utils/constants.go

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`99`	`99`	`}`
`100`	`100`	`}()`
`101`	`101`
`102`		`- configMapSyncer := clustersyncer.NewConfigMapSyncer(r.Client, instance)`
`103`		`- if err = syncer.Sync(ctx, configMapSyncer, r.Recorder); err != nil {`
	`102`	`+ mysqlCMSyncer := clustersyncer.NewMysqlCMSyncer(r.Client, instance)`
	`103`	`+ if err = syncer.Sync(ctx, mysqlCMSyncer, r.Recorder); err != nil {`
`104`	`104`	`return ctrl.Result{}, err`
`105`	`105`	`}`
`106`	`106`
`@@ -109,7 +109,8 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`109`	`109`	`return ctrl.Result{}, err`
`110`	`110`	`}`
`111`	`111`
`112`		`- cmRev := configMapSyncer.Object().(*corev1.ConfigMap).ResourceVersion`
	`112`	`+ // Todo: modify mysql cm will trigger rolling update but it will not be applied.`
	`113`	`+ cmRev := mysqlCMSyncer.Object().(*corev1.ConfigMap).ResourceVersion`
`113`	`114`	`sctRev := secretSyncer.Object().(*corev1.Secret).ResourceVersion`
`114`	`115`
`115`	`116`	`r.XenonExecutor.SetRootPassword(instance.Spec.MysqlOpts.RootPassword)`
`@@ -124,6 +125,7 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`124`	`125`	`clustersyncer.NewFollowerSVCSyncer(r.Client, instance),`
`125`	`126`	`clustersyncer.NewStatefulSetSyncer(r.Client, instance, cmRev, sctRev, r.SQLRunnerFactory, r.XenonExecutor),`
`126`	`127`	`clustersyncer.NewPDBSyncer(r.Client, instance),`
	`128`	`+ clustersyncer.NewXenonCMSyncer(r.Client, instance),`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`if instance.Spec.MetricsOpts.Enabled {`
Original file line number	Diff line number	Diff line change
`@@ -128,13 +128,12 @@ func (c backupSidecar) getReadinessProbe() corev1.Probe {`
`128`	`128`	`func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {`
`129`	`129`	`return []corev1.VolumeMount{`
`130`	`130`	`{`
`131`		`- Name: utils.ConfVolumeName,`
`132`		`- MountPath: utils.ConfVolumeMountPath,`
	`131`	`+ Name: utils.MysqlConfVolumeName,`
	`132`	`+ MountPath: utils.MysqlConfVolumeMountPath,`
`133`	`133`	`},`
`134`	`134`	`{`
`135`	`135`	`Name: utils.DataVolumeName,`
`136`	`136`	`MountPath: utils.DataVolumeMountPath,`
`137`		`- SubPath: utils.MysqlDataSubPath,`
`138`	`137`	`},`
`139`	`138`	`{`
`140`	`139`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -110,13 +110,12 @@ func (c initMysql) getReadinessProbe() corev1.Probe {`
`110`	`110`	`func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {`
`111`	`111`	`return []corev1.VolumeMount{`
`112`	`112`	`{`
`113`		`- Name: utils.ConfVolumeName,`
`114`		`- MountPath: utils.ConfVolumeMountPath,`
	`113`	`+ Name: utils.MysqlConfVolumeName,`
	`114`	`+ MountPath: utils.MysqlConfVolumeMountPath,`
`115`	`115`	`},`
`116`	`116`	`{`
`117`	`117`	`Name: utils.DataVolumeName,`
`118`	`118`	`MountPath: utils.DataVolumeMountPath,`
`119`		`- SubPath: utils.MysqlDataSubPath,`
`120`	`119`	`},`
`121`	`120`	`{`
`122`	`121`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,12 @@ var (`
`53`	`53`	`}`
`54`	`54`	`initMysqlVolumeMounts = []corev1.VolumeMount{`
`55`	`55`	`{`
`56`		`- Name: utils.ConfVolumeName,`
`57`		`- MountPath: utils.ConfVolumeMountPath,`
	`56`	`+ Name: utils.MysqlConfVolumeName,`
	`57`	`+ MountPath: utils.MysqlConfVolumeMountPath,`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`Name: utils.DataVolumeName,`
`61`	`61`	`MountPath: utils.DataVolumeMountPath,`
`62`		`- SubPath: utils.MysqlDataSubPath,`
`63`	`62`	`},`
`64`	`63`	`{`
`65`	`64`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,12 @@ func (c mysql) getReadinessProbe() corev1.Probe {`
`135`	`135`	`func (c *mysql) getVolumeMounts() []corev1.VolumeMount {`
`136`	`136`	`return []corev1.VolumeMount{`
`137`	`137`	`{`
`138`		`- Name: utils.ConfVolumeName,`
`139`		`- MountPath: utils.ConfVolumeMountPath,`
	`138`	`+ Name: utils.MysqlConfVolumeName,`
	`139`	`+ MountPath: utils.MysqlConfVolumeMountPath,`
`140`	`140`	`},`
`141`	`141`	`{`
`142`	`142`	`Name: utils.DataVolumeName,`
`143`	`143`	`MountPath: utils.DataVolumeMountPath,`
`144`		`- SubPath: utils.MysqlDataSubPath,`
`145`	`144`	`},`
`146`	`145`	`{`
`147`	`146`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,12 @@ func TestGetMysqlReadinessProbe(t *testing.T) {`
`141`	`141`	`func TestGetMysqlVolumeMounts(t *testing.T) {`
`142`	`142`	`volumeMounts := []corev1.VolumeMount{`
`143`	`143`	`{`
`144`		`- Name: "conf",`
	`144`	`+ Name: "mysql-conf",`
`145`	`145`	`MountPath: "/etc/mysql",`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`Name: "data",`
`149`	`149`	`MountPath: "/var/lib/mysql",`
`150`		`- SubPath: "mysql",`
`151`	`150`	`},`
`152`	`151`	`{`
`153`	`152`	`Name: "logs",`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,12 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {`
`115`	`115`	`MountPath: utils.ScriptsVolumeMountPath,`
`116`	`116`	`},`
`117`	`117`	`{`
`118`		`- Name: utils.DataVolumeName,`
`119`		`- MountPath: utils.XenonDataVolumeMountPath,`
`120`		`- SubPath: utils.XenonDataSubPath,`
	`118`	`+ Name: utils.XenonConfVolumeName,`
	`119`	`+ MountPath: utils.XenonConfVolumeMountPath,`
`121`	`120`	`},`
`122`	`121`	`{`
`123`		`- Name: utils.XenonVolumeName,`
`124`		`- MountPath: utils.XenonVolumeMountPath,`
	`122`	`+ Name: utils.XenonMetaVolumeName,`
	`123`	`+ MountPath: utils.XenonMetaVolumeMountPath,`
`125`	`124`	`},`
`126`	`125`	`{`
`127`	`126`	`Name: utils.SysLocalTimeZone,`
Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,12 @@ func TestGetXenonVolumeMounts(t *testing.T) {`
`135`	`135`	`MountPath: "/scripts",`
`136`	`136`	`},`
`137`	`137`	`{`
`138`		`- Name: "data",`
`139`		`- MountPath: "/var/lib/xenon",`
`140`		`- SubPath: "xenon",`
	`138`	`+ Name: "xenon-conf",`
	`139`	`+ MountPath: "/etc/xenon",`
`141`	`140`	`},`
`142`	`141`	`{`
`143`		`- Name: "xenon",`
`144`		`- MountPath: "/etc/xenon",`
	`142`	`+ Name: "xenon-meta",`
	`143`	`+ MountPath: "/var/lib/xenon",`
`145`	`144`	`},`
`146`	`145`	`{`
`147`	`146`	`Name: utils.SysLocalTimeZone,`