Add InitializeTimezoneData to populate timezone data with moco-init

Author: kevinrudde

api/v1beta2/mysqlcluster_types.go

@@ -143,6 +143,13 @@ type MySQLClusterSpec struct {
 	// communicate with mysqld over localhost when acting as a sidecar.
 	AgentUseLocalhost bool `json:"agentUseLocalhost,omitempty"`
 
+	// InitializeTimezoneData controls whether the init container should populate the timezone data.
+	// If set to true, the init container will load timezone data into MySQL.
+	// The default is false.
+	// +kubebuilder:default=false
+	// +optional
+	InitializeTimezoneData bool `json:"initializeTimezoneData,omitempty"`
+
 	// Offline sets the cluster offline, releasing compute resources. Data is not removed.
 	// +optional
 	Offline bool `json:"offline,omitempty"`

charts/moco/templates/generated/crds/moco_crds.yaml

@@ -2253,6 +2253,10 @@ spec:
                 disableSlowQueryLogContainer:
                   description: DisableSlowQueryLogContainer controls whether to...
                   type: boolean
+                initializeTimezoneData:
+                  default: false
+                  description: InitializeTimezoneData controls whether the init...
+                  type: boolean
                 logRotationSchedule:
                   description: LogRotationSchedule specifies the schedule to...
                   type: string

config/crd/bases/moco.cybozu.com_mysqlclusters.yaml

@@ -70,6 +70,10 @@ spec:
               disableSlowQueryLogContainer:
                 description: DisableSlowQueryLogContainer controls whether to...
                 type: boolean
+              initializeTimezoneData:
+                default: false
+                description: InitializeTimezoneData controls whether the init...
+                type: boolean
               logRotationSchedule:
                 description: LogRotationSchedule specifies the schedule to...
                 type: string

config/crd/tests/apiextensions.k8s.io_v1_customresourcedefinition_mysqlclusters.moco.cybozu.com.yaml

@@ -70,6 +70,10 @@ spec:
               disableSlowQueryLogContainer:
                 description: DisableSlowQueryLogContainer controls whether to...
                 type: boolean
+              initializeTimezoneData:
+                default: false
+                description: InitializeTimezoneData controls whether the init...
+                type: boolean
               logRotationSchedule:
                 description: LogRotationSchedule specifies the schedule to...
                 type: string

controllers/mysql_container.go

@@ -332,6 +332,7 @@ func (r *MySQLClusterReconciler) makeMocoInitContainer(ctx context.Context, clus
 		filepath.Join(constants.SharedPath, constants.InitCommand),
 		fmt.Sprintf("%s=%s", constants.MocoInitDataDirFlag, constants.MySQLDataPath),
 		fmt.Sprintf("%s=%s", constants.MocoInitConfDirFlag, constants.MySQLInitConfPath),
+		fmt.Sprintf("%s=%s", constants.MocoInitTimezoneDataFlag, strconv.FormatBool(cluster.Spec.InitializeTimezoneData)),
 		fmt.Sprintf("%d", cluster.Spec.ServerIDBase),
 	}
 

controllers/mysqlcluster_controller_test.go

@@ -1026,8 +1026,8 @@ dummyKey: dummyValue
 		Expect(initContainer.Name).To(Equal(constants.InitContainerName))
 		Expect(initContainer.Image).To(Equal("moco-mysql:latest"))
 		Expect(initContainer.Command).To(ContainElement(fmt.Sprintf("%d", cluster.Spec.ServerIDBase)))
-		Expect(initContainer.Resources.Requests).To(Equal(corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("100m"), corev1.ResourceMemory: resource.MustParse("300Mi")}))
-		Expect(initContainer.Resources.Limits).To(Equal(corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("100m"), corev1.ResourceMemory: resource.MustParse("300Mi")}))
+		Expect(initContainer.Resources.Requests).To(Equal(corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("100m"), corev1.ResourceMemory: resource.MustParse("512Mi")}))
+		Expect(initContainer.Resources.Limits).To(Equal(corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("100m"), corev1.ResourceMemory: resource.MustParse("512Mi")}))
 		Expect(initContainer.SecurityContext).NotTo(BeNil())
 		Expect(initContainer.SecurityContext.RunAsUser).NotTo(BeNil())
 		Expect(*initContainer.SecurityContext.RunAsUser).To(Equal(int64(constants.ContainerUID)))

docs/crd_mysqlcluster_v1beta2.md

@@ -87,6 +87,7 @@ MySQLClusterSpec defines the desired state of MySQLCluster
 | disableSlowQueryLogContainer | DisableSlowQueryLogContainer controls whether to add a sidecar container named \"slow-log\" to output slow logs as the containers output. If set to true, the sidecar container and configmap used by the sidecar container are not added. The default is false. | bool | false |
 | slowQueryLogConfigTmpl | SlowQueryLogConfigTmpl is the template for slow query log configuration file. If this field is null, MOCO uses the default slow query log configuration. `{{ .Path }}` will be replaced with the path to the slow query log file. | *string | false |
 | agentUseLocalhost | AgentUseLocalhost configures the mysqld interface to bind and be accessed over localhost instead of pod name. During container init moco-agent will set mysql admin interface is bound to localhost. The moco-agent will also communicate with mysqld over localhost when acting as a sidecar. | bool | false |
+| initializeTimezoneData | InitializeTimezoneData controls whether the init container should populate the timezone data. If set to true, the init container will load timezone data into MySQL. The default is false. | bool | false |
 | offline | Offline sets the cluster offline, releasing compute resources. Data is not removed. | bool | false |
 
 [Back to Custom Resources](#custom-resources)

docs/customize-system-container.md

@@ -38,7 +38,7 @@ Specifying container names in `overwriteContainers` that are not listed here wil
 | Name            | Default CPU Requests/Limits | Default Memory Requests/Limits | Description                                                                                                                                             |
 | --------------- | --------------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | agent           | `100m` / `100m`             | `100Mi` / `100Mi`              | MOCO's agent container running in sidecar. refs: https://github.com/cybozu-go/moco-agent                                                                |
-| moco-init       | `100m` / `100m`             | `300Mi` / `300Mi`              | Initializes MySQL data directory and create a configuration snippet to give instance specific configuration values such as server_id and admin_address. |
+| moco-init       | `100m` / `100m`             | `512Mi` / `512Mi`              | Initializes MySQL data directory and create a configuration snippet to give instance specific configuration values such as server_id and admin_address. |
 | slow-log        | `100m` / `100m`             | `20Mi` / `20Mi`                | Sidecar container for outputting slow query logs.                                                                                                       |
 | mysqld-exporter | `200m` / `200m`             | `100Mi` / `100Mi`              | MySQL server exporter sidecar container.                                                                                                                |
 

pkg/constants/constants.go

@@ -65,6 +65,8 @@ const (
 	MocoInitDataDirFlag = "--data-dir"
 	// MocoInitConfDirFlag is flag for conf dir.
 	MocoInitConfDirFlag = "--conf-dir"
+	// MocoInitTimezoneDataFlag is flag for populating timezone data.
+	MocoInitTimezoneDataFlag = "--init-timezones"
 	// MocoMySQLDLocalhostFlag is flag for localhost bind.
 	MocoMySQLDLocalhostFlag = "--mysqld-localhost"
 )

pkg/constants/container.go

@@ -19,8 +19,8 @@ const (
 
 	InitContainerCPURequest = "100m"
 	InitContainerCPULimit   = "100m"
-	InitContainerMemRequest = "300Mi"
-	InitContainerMemLimit   = "300Mi"
+	InitContainerMemRequest = "512Mi"
+	InitContainerMemLimit   = "512Mi"
 
 	SlowQueryLogAgentCPURequest = "100m"
 	SlowQueryLogAgentCPULimit   = "100m"