Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mysqlcluster/container/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,9 @@ func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {
Name: utils.LogsVolumeName,
MountPath: utils.LogsVolumeMountPath,
},
{
Name: utils.SysLocalTimeZone,
MountPath: utils.SysLocalTimeZoneMountPath,
},
}
}
4 changes: 4 additions & 0 deletions mysqlcluster/container/init_mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,9 @@ func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {
Name: utils.InitFileVolumeName,
MountPath: utils.InitFileVolumeMountPath,
},
{
Name: utils.SysLocalTimeZone,
MountPath: utils.SysLocalTimeZoneMountPath,
},
}
}
4 changes: 4 additions & 0 deletions mysqlcluster/container/init_mysql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ var (
Name: utils.InitFileVolumeName,
MountPath: utils.InitFileVolumeMountPath,
},
{
Name: utils.SysLocalTimeZone,
MountPath: utils.SysLocalTimeZoneMountPath,
},
}
optFalse = false
optTrue = true
Expand Down
4 changes: 4 additions & 0 deletions mysqlcluster/container/init_sidecar.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions mysqlcluster/container/init_sidecar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@ var (
Name: utils.InitFileVolumeName,
MountPath: utils.InitFileVolumeMountPath,
},
{
Name: utils.SysLocalTimeZone,
MountPath: utils.SysLocalTimeZoneMountPath,
},
}
initSidecarCase = EnsureContainer("init-sidecar", &testInitSidecarCluster)
)
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions mysqlcluster/container/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,9 @@ func (c *mysql) getVolumeMounts() []corev1.VolumeMount {
Name: utils.LogsVolumeName,
MountPath: utils.LogsVolumeMountPath,
},
{
Name: utils.SysLocalTimeZone,
MountPath: utils.SysLocalTimeZoneMountPath,
},
}
}
5 changes: 5 additions & 0 deletions mysqlcluster/container/mysql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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)
}
4 changes: 4 additions & 0 deletions mysqlcluster/container/xenon.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,9 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {
Name: utils.XenonVolumeName,
MountPath: utils.XenonVolumeMountPath,
},
{
Name: utils.SysLocalTimeZone,
MountPath: utils.SysLocalTimeZoneMountPath,
},
}
}
5 changes: 5 additions & 0 deletions mysqlcluster/container/xenon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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)
}
8 changes: 8 additions & 0 deletions mysqlcluster/mysqlcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions mysqlcluster/mysqlcluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
9 changes: 9 additions & 0 deletions utils/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down