Merge pull request #444 from radondb/v2.2.0

andyli029 · web-flow · commit bf93a6b2ba3e · 2022-04-11T18:35:52.000+08:00
Support MySQL 8.0
diff --git a/Makefile b/Makefile
@@ -73,7 +73,8 @@ docker-build: test ## Build docker image with the manager.
 	docker build -t ${IMG} .
 	docker build -f Dockerfile.sidecar -t ${SIDECAR_IMG} .
 	docker build -f hack/xenon/Dockerfile -t ${XENON_IMG} hack/xenon
-
+mysql8-sidecar:
+	docker build --build-arg XTRABACKUP_PKG=percona-xtrabackup-80  -f  Dockerfile.sidecar -t ${SIDECAR_IMG} .
 docker-push: ## Push docker image with the manager.
 	docker push ${IMG}
 	docker push ${SIDECAR_IMG}
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.
@@ -120,7 +120,7 @@ type MysqlOpts struct {
 
 	// InitTokuDB represents if install tokudb engine.
 	// +optional
-	// +kubebuilder:default:=true
+	// +kubebuilder:default:=false
 	InitTokuDB bool `json:"initTokuDB,omitempty"`
 
 	// A map[string]string that will be passed to my.cnf file.
@@ -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/charts/mysql-operator/crds/mysql.radondb.com_backups.yaml b/charts/mysql-operator/crds/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/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml b/charts/mysql-operator/crds/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/charts/mysql-operator/values.yaml b/charts/mysql-operator/values.yaml
@@ -21,7 +21,7 @@ tolerationSeconds: 30
 
 manager:
   image: radondb/mysql-operator
-  tag: latest
+  tag: v2.2.0
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
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/config/samples/mysql_v1alpha1_mysqlcluster.yaml b/config/samples/mysql_v1alpha1_mysqlcluster.yaml
@@ -62,7 +62,7 @@ spec:
 
   podPolicy:
     imagePullPolicy: IfNotPresent
-    sidecarImage: radondb/mysql-sidecar:latest
+    sidecarImage: radondb/mysql57-sidecar:v2.2.0
     busyboxImage: busybox:1.32
 
     slowLogTail: false
diff --git a/config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml b/config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml
@@ -0,0 +1,89 @@
+apiVersion: mysql.radondb.com/v1alpha1
+kind: MysqlCluster
+metadata:
+  name: sample
+spec:
+  replicas: 3
+  mysqlVersion: "8.0"
+  
+  # the backupSecretName specify the secret file name which store S3 information,
+  # if you want S3 backup or restore, please create backup_secret.yaml, uncomment below and fill secret name:
+  # backupSecretName: 
+  
+  # if you want create mysqlcluster from S3, uncomment and fill the directory in S3 bucket below:
+  # restoreFrom: 
+  
+  mysqlOpts:
+    rootPassword: "RadonDB@123"
+    rootHost: localhost
+    user: radondb_usr
+    password: RadonDB@123
+    database: radondb
+    ## tokudb is not supported in mysql8.
+    # initTokuDB: false
+
+    # A simple map between string and string.
+    # Such as:
+    #    mysqlConf:
+    #      expire_logs_days: "7"
+    mysqlConf: {}
+
+    resources:
+      requests:
+        cpu: 100m
+        memory: 256Mi
+      limits:
+        cpu: 500m
+        memory: 1Gi
+
+  xenonOpts:
+    image: radondb/xenon:1.1.5-alpha
+    admitDefeatHearbeatCount: 5
+    electionTimeout: 10000
+
+    resources:
+      requests:
+        cpu: 50m
+        memory: 128Mi
+      limits:
+        cpu: 100m
+        memory: 256Mi
+
+  metricsOpts:
+    enabled: false
+    image: prom/mysqld-exporter:v0.12.1
+
+    resources:
+      requests:
+        cpu: 10m
+        memory: 32Mi
+      limits:
+        cpu: 100m
+        memory: 128Mi
+
+  podPolicy:
+    imagePullPolicy: IfNotPresent
+    sidecarImage: radondb/mysql80-sidecar:v2.2.0
+    busyboxImage: busybox:1.32
+
+    slowLogTail: false
+    auditLogTail: false
+
+    labels: {}
+    annotations: {}
+    affinity: {}
+    priorityClassName: ""
+    tolerations: []
+    schedulerName: ""
+    # extraResources defines quotas for containers other than mysql or xenon.
+    extraResources:
+      requests:
+        cpu: 10m
+        memory: 32Mi
+
+  persistence:
+    enabled: true
+    accessModes:
+    - ReadWriteOnce
+    #storageClass: ""
+    size: 20Gi
diff --git a/config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml b/config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml
@@ -62,7 +62,7 @@ spec:
 
   podPolicy:
     imagePullPolicy: IfNotPresent
-    sidecarImage: radondb/mysql-sidecar:latest
+    sidecarImage: radondb/mysql57-sidecar:v2.2.0
     busyboxImage: busybox:1.32
 
     slowLogTail: false
diff --git a/docs/en-us/deploy_radondb_mysql8.md b/docs/en-us/deploy_radondb_mysql8.md
@@ -0,0 +1,10 @@
+# Deploy
+use sample `config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml` , modify the `spec.podPolicy.sidecarImage` to MySQL8 version sidecar image.
+install step 
+[deploy reference](deploy_radondb-mysql_operator_on_kubesphere.md) 
+# How to build sidecar images?
+After you had installed docker , use command:
+```
+make mysql8-sidecar
+```
+it will build mysql8 sidecar image.Then `docker push xxx` to push to docker hub.
diff --git a/mysqlcluster/container/init_mysql.go b/mysqlcluster/container/init_mysql.go
@@ -44,7 +44,8 @@ func (c *initMysql) getImage() string {
 
 // getCommand get the container command.
 func (c *initMysql) getCommand() []string {
-	return nil
+	// Because initialize mysql contain error, so do it in commands.
+	return []string{"sh", "-c", "/docker-entrypoint.sh mysqld;if test -f /docker-entrypoint-initdb.d/special.sh; then /docker-entrypoint-initdb.d/special.sh; fi "}
 }
 
 // getEnvVars get the container env.
diff --git a/mysqlcluster/container/init_mysql_test.go b/mysqlcluster/container/init_mysql_test.go
@@ -115,7 +115,7 @@ func TestGetInitMysqlImage(t *testing.T) {
 }
 
 func TestGetInitMysqlCommand(t *testing.T) {
-	assert.Nil(t, initMysqlCase.Command)
+	assert.Equal(t, initMysqlCase.Command, []string{"sh", "-c", "/docker-entrypoint.sh mysqld;if test -f /docker-entrypoint-initdb.d/special.sh; then /docker-entrypoint-initdb.d/special.sh; fi "})
 }
 
 func TestGetInitMysqlEnvVar(t *testing.T) {
diff --git a/mysqlcluster/mysqlcluster.go b/mysqlcluster/mysqlcluster.go
@@ -70,7 +70,12 @@ func (c *MysqlCluster) Validate() error {
 	if utils.StringInArray(c.Spec.MysqlOpts.User, []string{"root", utils.ReplicationUser, utils.OperatorUser, utils.MetricsUser}) {
 		return fmt.Errorf("spec.mysqlOpts.user cannot be root|%s|%s|%s", utils.ReplicationUser, utils.OperatorUser, utils.MetricsUser)
 	}
-
+	// MySQL8 nerver support TokuDB
+	// https://www.percona.com/blog/2021/05/21/tokudb-support-changes-and-future-removal-from-percona-server-for-mysql-8-0/
+	if c.Spec.MysqlVersion == "8.0" && c.Spec.MysqlOpts.InitTokuDB {
+		log.Info("TokuDB is not supported in MySQL 8.0 any more, the value in Cluster.spec.mysqlOpts.initTokuDB should be set false")
+		return nil
+	}
 	// https://github.com/percona/percona-docker/blob/main/percona-server-5.7/ps-entry.sh#L159
 	// ERROR 1396 (HY000): Operation CREATE USER failed for 'root'@'127.0.0.1'.
 	if c.Spec.MysqlOpts.RootHost == "127.0.0.1" {
@@ -91,12 +96,17 @@ func (c *MysqlCluster) GetLabels() labels.Set {
 	if comp, ok := c.Annotations["app.kubernetes.io/component"]; ok {
 		component = comp
 	}
-
+	// version := ""
+	// if _, ok := c.Labels["app.kubernetes.io/version"]; !ok {
+	// 	version = c.GetMySQLVersion()
+	// }
 	labels := labels.Set{
-		"mysql.radondb.com/cluster":    c.Name,
-		"app.kubernetes.io/name":       "mysql",
-		"app.kubernetes.io/instance":   instance,
-		"app.kubernetes.io/version":    c.GetMySQLVersion(),
+		"mysql.radondb.com/cluster":  c.Name,
+		"app.kubernetes.io/name":     "mysql",
+		"app.kubernetes.io/instance": instance,
+		// Notice: if app.kubernetes.io/version changed, then statefulset update will failure, It is not need to do this.
+		// So delete this label.
+		//"app.kubernetes.io/version":    version,
 		"app.kubernetes.io/component":  component,
 		"app.kubernetes.io/managed-by": "mysql.radondb.com",
 	}
diff --git a/mysqlcluster/mysqlcluster_test.go b/mysqlcluster/mysqlcluster_test.go
@@ -72,10 +72,10 @@ func TestGetLabel(t *testing.T) {
 			&testMysqlCluster,
 		}
 		want := labels.Set{
-			"mysql.radondb.com/cluster":    "sample",
-			"app.kubernetes.io/name":       "mysql",
-			"app.kubernetes.io/instance":   "instance",
-			"app.kubernetes.io/version":    "5.7.34",
+			"mysql.radondb.com/cluster":  "sample",
+			"app.kubernetes.io/name":     "mysql",
+			"app.kubernetes.io/instance": "instance",
+			//"app.kubernetes.io/version":    "5.7.34",
 			"app.kubernetes.io/component":  "database",
 			"app.kubernetes.io/managed-by": "mysql.radondb.com",
 		}
@@ -91,10 +91,10 @@ func TestGetLabel(t *testing.T) {
 			&testMysqlCluster,
 		}
 		want := labels.Set{
-			"mysql.radondb.com/cluster":    "sample",
-			"app.kubernetes.io/name":       "mysql",
-			"app.kubernetes.io/instance":   "sample",
-			"app.kubernetes.io/version":    "5.7.34",
+			"mysql.radondb.com/cluster":  "sample",
+			"app.kubernetes.io/name":     "mysql",
+			"app.kubernetes.io/instance": "sample",
+			//"app.kubernetes.io/version":    "5.7.34",
 			"app.kubernetes.io/component":  "component",
 			"app.kubernetes.io/managed-by": "mysql.radondb.com",
 		}
@@ -110,10 +110,10 @@ func TestGetLabel(t *testing.T) {
 			&testMysqlCluster,
 		}
 		want := labels.Set{
-			"mysql.radondb.com/cluster":    "sample",
-			"app.kubernetes.io/name":       "mysql",
-			"app.kubernetes.io/instance":   "sample",
-			"app.kubernetes.io/version":    "5.7.34",
+			"mysql.radondb.com/cluster":  "sample",
+			"app.kubernetes.io/name":     "mysql",
+			"app.kubernetes.io/instance": "sample",
+			//"app.kubernetes.io/version":    "5.7.34",
 			"app.kubernetes.io/component":  "database",
 			"app.kubernetes.io/managed-by": "mysql.radondb.com",
 			"app.kubernetes.io/part-of":    "part-of",
@@ -139,7 +139,7 @@ func TestGetMySQLVersion(t *testing.T) {
 		testCase := MysqlCluster{
 			&testMysqlCluster,
 		}
-		want := utils.InvalidMySQLVersion
+		want := "8.0.25"
 		assert.Equal(t, want, testCase.GetMySQLVersion())
 	}
 	// MySQLTagsToSemVer 5.7 -> 5.7.34
diff --git a/mysqlcluster/syncer/config_map.go b/mysqlcluster/syncer/config_map.go
diff --git a/mysqlcluster/syncer/mysql_configs.go b/mysqlcluster/syncer/mysql_configs.go
diff --git a/mysqlcluster/syncer/statefulset.go b/mysqlcluster/syncer/statefulset.go
diff --git a/mysqlcluster/syncer/variables.go b/mysqlcluster/syncer/variables.go
diff --git a/sidecar/config.go b/sidecar/config.go
diff --git a/sidecar/init.go b/sidecar/init.go
diff --git a/utils/constants.go b/utils/constants.go
