Merge pull request #443 from runkecheng/fix_fmt_2.2

andyli029 · web-flow · commit 70841433d3f4 · 2022-04-11T18:31:55.000+08:00
Merge pull request #437 from runkecheng/feature_mysql8
diff --git a/api/v1alpha1/backup_types.go b/api/v1alpha1/backup_types.go
@@ -31,7 +31,7 @@ type BackupSpec struct {
 
 	// To specify the image that will be used for sidecar container.
 	// +optional
-	// +kubebuilder:default:="radondb/mysql-sidecar:latest"
+	// +kubebuilder:default:="radondb/mysql57-sidecar:v2.2.0"
 	Image string `json:"image"`
 
 	// HostName represents the host for which to take backup
diff --git a/api/v1alpha1/mysqlcluster_types.go b/api/v1alpha1/mysqlcluster_types.go
@@ -65,7 +65,7 @@ type MysqlClusterSpec struct {
 
 	// PodPolicy defines the policy to extra specification.
 	// +optional
-	// +kubebuilder:default:={imagePullPolicy: "IfNotPresent", extraResources: {requests: {cpu: "10m", memory: "32Mi"}}, sidecarImage: "radondb/mysql-sidecar:latest", busyboxImage: "busybox:1.32"}
+	// +kubebuilder:default:={imagePullPolicy: "IfNotPresent", extraResources: {requests: {cpu: "10m", memory: "32Mi"}}, sidecarImage: "radondb/mysql57-sidecar:v2.2.0", busyboxImage: "busybox:1.32"}
 	PodPolicy PodPolicy `json:"podPolicy,omitempty"`
 
 	// PVC extra specifiaction.
@@ -199,7 +199,7 @@ type PodPolicy struct {
 
 	// To specify the image that will be used for sidecar container.
 	// +optional
-	// +kubebuilder:default:="radondb/mysql-sidecar:latest"
+	// +kubebuilder:default:="radondb/mysql57-sidecar:v2.2.0"
 	SidecarImage string `json:"sidecarImage,omitempty"`
 
 	// The busybox image.
diff --git a/config/crd/bases/mysql.radondb.com_backups.yaml b/config/crd/bases/mysql.radondb.com_backups.yaml
@@ -48,7 +48,7 @@ spec:
                 description: HostName represents the host for which to take backup
                 type: string
               image:
-                default: radondb/mysql-sidecar:latest
+                default: radondb/mysql57-sidecar:v2.2.0
                 description: To specify the image that will be used for sidecar container.
                 type: string
             required:
diff --git a/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml b/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml
@@ -137,7 +137,7 @@ spec:
                     description: Name for new database to create.
                     type: string
                   initTokuDB:
-                    default: true
+                    default: false
                     description: InitTokuDB represents if install tokudb engine.
                     type: boolean
                   mysqlConf:
@@ -252,7 +252,7 @@ spec:
                       cpu: 10m
                       memory: 32Mi
                   imagePullPolicy: IfNotPresent
-                  sidecarImage: radondb/mysql-sidecar:latest
+                  sidecarImage: radondb/mysql57-sidecar:v2.2.0
                 description: PodPolicy defines the policy to extra specification.
                 properties:
                   affinity:
@@ -1182,7 +1182,7 @@ spec:
                   schedulerName:
                     type: string
                   sidecarImage:
-                    default: radondb/mysql-sidecar:latest
+                    default: radondb/mysql57-sidecar:v2.2.0
                     description: To specify the image that will be used for sidecar
                       container.
                     type: string
diff --git a/mysqlcluster/syncer/config_map.go b/mysqlcluster/syncer/config_map.go
@@ -77,7 +77,7 @@ func buildMysqlConf(c *mysqlcluster.MysqlCluster) (string, error) {
 	case "5.7":
 		addKVConfigsToSection(sec, mysql57Configs)
 	}
-	
+
 	addKVConfigsToSection(sec, mysqlSysConfigs, mysqlCommonConfigs, mysqlStaticConfigs, c.Spec.MysqlOpts.MysqlConf)
 
 	if c.Spec.MysqlOpts.InitTokuDB {
diff --git a/mysqlcluster/syncer/mysql_configs.go b/mysqlcluster/syncer/mysql_configs.go
@@ -35,31 +35,31 @@ var mysqlSysConfigs = map[string]string{
 	"innodb_open_files":   "655360",
 	"open_files_limit":    "655360",
 
-	"gtid-mode":                 "ON",
-	"enforce-gtid-consistency":  "ON",
-	"slave_parallel_type":       "LOGICAL_CLOCK",
-	"relay_log":                 "/var/lib/mysql/mysql-relay-bin",
-	"relay_log_index":           "/var/lib/mysql/mysql-relay-bin.index",
-	"slow_query_log":            "1",
-	"tmp_table_size":            "32M",
-	"tmpdir":                    "/var/lib/mysql",
+	"gtid-mode":                "ON",
+	"enforce-gtid-consistency": "ON",
+	"slave_parallel_type":      "LOGICAL_CLOCK",
+	"relay_log":                "/var/lib/mysql/mysql-relay-bin",
+	"relay_log_index":          "/var/lib/mysql/mysql-relay-bin.index",
+	"slow_query_log":           "1",
+	"tmp_table_size":           "32M",
+	"tmpdir":                   "/var/lib/mysql",
 }
 
 var pluginConfigs = map[string]string{
-	"plugin-load":                        "\"semisync_master.so;semisync_slave.so;audit_log.so;connection_control.so\"",
+	"plugin-load": "\"semisync_master.so;semisync_slave.so;audit_log.so;connection_control.so\"",
 
 	"rpl_semi_sync_master_enabled":       "OFF",
 	"rpl_semi_sync_slave_enabled":        "ON",
 	"rpl_semi_sync_master_wait_no_slave": "ON",
 	"rpl_semi_sync_master_timeout":       "1000000000000000000",
 
-	"audit_log_file":                     "/var/log/mysql/mysql-audit.log",
-	"audit_log_exclude_accounts":         "\"root@localhost,root@127.0.0.1," + utils.ReplicationUser + "@%," + utils.MetricsUser + "@%\"",
-	"audit_log_buffer_size":              "16M",
-	"audit_log_policy":                                "NONE",
-	"audit_log_rotate_on_size":                        "104857600",
-	"audit_log_rotations":                             "6",
-	"audit_log_format":                                "OLD",
+	"audit_log_file":             "/var/log/mysql/mysql-audit.log",
+	"audit_log_exclude_accounts": "\"root@localhost,root@127.0.0.1," + utils.ReplicationUser + "@%," + utils.MetricsUser + "@%\"",
+	"audit_log_buffer_size":      "16M",
+	"audit_log_policy":           "NONE",
+	"audit_log_rotate_on_size":   "104857600",
+	"audit_log_rotations":        "6",
+	"audit_log_format":           "OLD",
 
 	"connection_control_failed_connections_threshold": "3",
 	"connection_control_min_connection_delay":         "1000",
@@ -74,16 +74,16 @@ var mysql57Configs = map[string]string{
 
 	"expire-logs-days": "7",
 
-	"master_info_repository":    "TABLE",
-	"relay_log_info_repository": "TABLE",
-	"slave_rows_search_algorithms":    "INDEX_SCAN,HASH_SCAN",
+	"master_info_repository":       "TABLE",
+	"relay_log_info_repository":    "TABLE",
+	"slave_rows_search_algorithms": "INDEX_SCAN,HASH_SCAN",
 }
 
 var mysql80Configs = map[string]string{
 	"sql-mode": "STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_VALUE_ON_ZERO,NO_ENGINE_SUBSTITUTION," +
-	"NO_ZERO_DATE,NO_ZERO_IN_DATE,ONLY_FULL_GROUP_BY",
+		"NO_ZERO_DATE,NO_ZERO_IN_DATE,ONLY_FULL_GROUP_BY",
 	// 7 days = 7 * 24 * 60 * 60
-	"binlog_expire_logs_seconds": "604800", 
+	"binlog_expire_logs_seconds": "604800",
 	// use 5.7 auth plugin to be backward compatible
 	"default-authentication-plugin": "mysql_native_password",
 }
diff --git a/sidecar/init.go b/sidecar/init.go
@@ -285,12 +285,12 @@ cp %s %s
 cp %s %s
 chown -R mysql.mysql %s
 chown -R mysql.mysql %s`,
-			// cp plugin.cnf to /etc/mysql/conf.d/
-			path.Join(initFilePath, utils.PluginConfigs), path.Join(extraConfPath, utils.PluginConfigs),
-			// cp extra.cnf to /etc/mysql/conf.d/
-			path.Join(initFilePath, "extra.cnf"), path.Join(extraConfPath, "extra.cnf"),
-			// chown -R mysql.mysql plugin.cnf
-			path.Join(extraConfPath, utils.PluginConfigs),
-			// chown -R mysql.mysql extra.cnf
-			path.Join(extraConfPath, "extra.cnf"))
+		// cp plugin.cnf to /etc/mysql/conf.d/
+		path.Join(initFilePath, utils.PluginConfigs), path.Join(extraConfPath, utils.PluginConfigs),
+		// cp extra.cnf to /etc/mysql/conf.d/
+		path.Join(initFilePath, "extra.cnf"), path.Join(extraConfPath, "extra.cnf"),
+		// chown -R mysql.mysql plugin.cnf
+		path.Join(extraConfPath, utils.PluginConfigs),
+		// chown -R mysql.mysql extra.cnf
+		path.Join(extraConfPath, "extra.cnf"))
 }
diff --git a/utils/constants.go b/utils/constants.go
@@ -132,7 +132,7 @@ const (
 	// LeaderHost is the alias for leader`s host.
 	LeaderHost = "leader-host"
 
-	// 
+	// PluginConfigs is the alias for mysql plugin config.
 	PluginConfigs = "plugin.cnf"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func buildMysqlConf(c *mysqlcluster.MysqlCluster) (string, error) {`
`77`	`77`	`case "5.7":`
`78`	`78`	`addKVConfigsToSection(sec, mysql57Configs)`
`79`	`79`	`}`
`80`		`-`
	`80`	`+`
`81`	`81`	`addKVConfigsToSection(sec, mysqlSysConfigs, mysqlCommonConfigs, mysqlStaticConfigs, c.Spec.MysqlOpts.MysqlConf)`
`82`	`82`
`83`	`83`	`if c.Spec.MysqlOpts.InitTokuDB {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ const (`
`132`	`132`	// LeaderHost is the alias for leader`s host.
`133`	`133`	`LeaderHost = "leader-host"`
`134`	`134`
`135`		`- //`
	`135`	`+ // PluginConfigs is the alias for mysql plugin config.`
`136`	`136`	`PluginConfigs = "plugin.cnf"`
`137`	`137`	`)`
`138`	`138`