Merge pull request #332 from acekingke/fixTimeZone

mysqlcluster, utils: The time zone of the container and the mysql are…

mysqlcluster/container/backup.go

@@ -139,5 +139,9 @@ func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.LogsVolumeName,
 			MountPath: utils.LogsVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }

mysqlcluster/container/init_mysql.go

@@ -124,5 +124,9 @@ func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }

mysqlcluster/container/init_mysql_test.go

@@ -67,6 +67,10 @@ var (
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 	optFalse      = false
 	optTrue       = true

mysqlcluster/container/init_sidecar.go

@@ -182,6 +182,10 @@ func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 
 	if c.Spec.MysqlOpts.InitTokuDB {

mysqlcluster/container/init_sidecar_test.go

@@ -290,6 +290,10 @@ var (
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 	initSidecarCase = EnsureContainer("init-sidecar", &testInitSidecarCluster)
 )
@@ -432,7 +436,7 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 			MysqlCluster: &testToKuDBMysqlCluster,
 		}
 		tokudbCase := EnsureContainer("init-sidecar", &testTokuDBCluster)
-		tokuDBVolumeMounts := make([]corev1.VolumeMount, 5, 6)
+		tokuDBVolumeMounts := make([]corev1.VolumeMount, 6, 7)
 		copy(tokuDBVolumeMounts, defaultInitsidecarVolumeMounts)
 		tokuDBVolumeMounts = append(tokuDBVolumeMounts, corev1.VolumeMount{
 			Name:      utils.SysVolumeName,
@@ -448,7 +452,7 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 			MysqlCluster: &testPersistenceMysqlCluster,
 		}
 		persistenceCase := EnsureContainer("init-sidecar", &testPersistenceCluster)
-		persistenceVolumeMounts := make([]corev1.VolumeMount, 5, 6)
+		persistenceVolumeMounts := make([]corev1.VolumeMount, 6, 7)
 		copy(persistenceVolumeMounts, defaultInitsidecarVolumeMounts)
 		persistenceVolumeMounts = append(persistenceVolumeMounts, corev1.VolumeMount{
 			Name:      utils.DataVolumeName,

mysqlcluster/container/mysql.go

@@ -134,5 +134,9 @@ func (c *mysql) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.LogsVolumeName,
 			MountPath: utils.LogsVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }

mysqlcluster/container/mysql_test.go

@@ -24,6 +24,7 @@ import (
 
 	mysqlv1alpha1 "github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"
 	"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"
+	"github.com/radondb/radondb-mysql-kubernetes/utils"
 )
 
 var (
@@ -149,6 +150,10 @@ func TestGetMysqlVolumeMounts(t *testing.T) {
 			Name:      "logs",
 			MountPath: "/var/log/mysql",
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: "/etc/localtime",
+		},
 	}
 	assert.Equal(t, volumeMounts, mysqlCase.VolumeMounts)
 }

mysqlcluster/container/xenon.go

@@ -114,5 +114,9 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.XenonVolumeName,
 			MountPath: utils.XenonVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }

mysqlcluster/container/xenon_test.go

@@ -25,6 +25,7 @@ import (
 
 	mysqlv1alpha1 "github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"
 	"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"
+	"github.com/radondb/radondb-mysql-kubernetes/utils"
 )
 
 var (
@@ -132,6 +133,10 @@ func TestGetXenonVolumeMounts(t *testing.T) {
 			Name:      "xenon",
 			MountPath: "/etc/xenon",
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: "/etc/localtime",
+		},
 	}
 	assert.Equal(t, volumeMounts, xenonCase.VolumeMounts)
 }

mysqlcluster/mysqlcluster.go

@@ -221,6 +221,14 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
+		corev1.Volume{
+			Name: utils.SysLocalTimeZone,
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: utils.SysLocalTimeZoneHostPath,
+				},
+			},
+		},
 	)
 
 	return volumes

mysqlcluster/mysqlcluster_test.go

@@ -283,6 +283,14 @@ func TestEnsureVolumes(t *testing.T) {
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
+		{
+			Name: utils.SysLocalTimeZone,
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: utils.SysLocalTimeZoneHostPath,
+				},
+			},
+		},
 	}
 	// when disable Persistence
 	{

utils/constants.go

@@ -108,6 +108,15 @@ const (
 	XenonVolumeMountPath    = "/etc/xenon"
 	InitFileVolumeMountPath = "/docker-entrypoint-initdb.d"
 
+	// Volume timezone name.
+	SysLocalTimeZone = "localtime"
+
+	// Volume host path for time zone.
+	SysLocalTimeZoneHostPath = "/etc/localtime"
+
+	// Volume mount path for time zone.
+	SysLocalTimeZoneMountPath = "/etc/localtime"
+
 	// The path to the client MySQL client configuration.
 	// The file used to liveness and readiness check.
 	ConfClientPath = "/etc/mysql/client.conf"