Add support for the official MySQL Docker image

Author: hors

build/ps-entrypoint.sh

@@ -139,6 +139,15 @@ CFG=/etc/my.cnf.d/node.cnf
 TLS_DIR=/etc/mysql/mysql-tls-secret
 CUSTOM_CONFIG_FILES=("/etc/mysql/config/auto-config.cnf" "/etc/mysql/config/my-config.cnf" "/etc/mysql/config/my-secret.cnf")
 
+if [[ ${HOSTNAME} =~ "-xb-" ]]; then
+	FQDN=${HOSTNAME}
+else
+	CLUSTER_NAME="$(echo ${HOSTNAME%-[0-9]})"
+	SERVER_NUM=${HOSTNAME/$CLUSTER_NAME-/}
+	SERVER_ID=${CLUSTER_HASH}${SERVER_NUM}
+	FQDN="${HOSTNAME}.${SERVICE_NAME}.$(</var/run/secrets/kubernetes.io/serviceaccount/namespace)"
+fi
+
 install_keyring_component() {
 	echo -n '{ "components": "file://component_keyring_vault" }' >/var/lib/mysql/mysqld.my
 	cp ${KEYRING_VAULT_PATH} /var/lib/mysql/component_keyring_vault.cnf
@@ -167,17 +176,6 @@ add_encryption_options() {
 }
 
 create_default_cnf() {
-	POD_IP=$(hostname -I | awk '{print $1}')
-
-	if [[ ${HOSTNAME} =~ "-xb-" ]]; then
-		FQDN=${HOSTNAME}
-	else
-		CLUSTER_NAME="$(hostname -f | cut -d'.' -f2)"
-		SERVER_NUM=${HOSTNAME/$CLUSTER_NAME-/}
-		SERVER_ID=${CLUSTER_HASH}${SERVER_NUM}
-		FQDN="${HOSTNAME}.${SERVICE_NAME}.$(</var/run/secrets/kubernetes.io/serviceaccount/namespace)"
-	fi
-
 	echo '[mysqld]' >$CFG
 	sed -i "/\[mysqld\]/a read_only=ON" $CFG
 	sed -i "/\[mysqld\]/a server_id=${SERVER_ID}" $CFG
@@ -218,8 +216,6 @@ create_default_cnf() {
 }
 
 load_group_replication_plugin() {
-	POD_IP=$(hostname -I | awk '{print $1}')
-
 	sed -i "/\[mysqld\]/a plugin_load_add=group_replication.so" $CFG
 	sed -i "/\[mysqld\]/a group_replication_exit_state_action=ABORT_SERVER" $CFG
 }
@@ -229,6 +225,13 @@ ensure_read_only() {
 	sed -i "/\[mysqld\]/a super_read_only=ON" $CFG
 }
 
+# Sync node.cnf to /etc/mysql/conf.d so Oracle MySQL image picks it up (it uses !includedir /etc/mysql/conf.d/ only).
+sync_node_cnf_for_oracle() {
+	if [ -d /etc/mysql/conf.d ]; then
+		cp -f "$CFG" /etc/mysql/conf.d/node.cnf
+	fi
+}
+
 escape_special() {
 	{ set +x; } 2>/dev/null
 	echo "$1" \
@@ -435,6 +438,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 	load_group_replication_plugin
 	ensure_read_only
+	sync_node_cnf_for_oracle
 
 	# exit when MYSQL_INIT_ONLY environment variable is set to avoid starting mysqld
 	if [ -n "$MYSQL_INIT_ONLY" ]; then
@@ -455,7 +459,7 @@ fi
 
 if [[ -f /var/lib/mysql/full-cluster-crash ]]; then
 	set +o xtrace
-	node_name=$(hostname -f)
+	node_name=${HOSTNAME}
 	gtid_executed=$(</var/lib/mysql/full-cluster-crash)
 	namespace=$(</var/run/secrets/kubernetes.io/serviceaccount/namespace)
 
@@ -464,7 +468,7 @@ if [[ -f /var/lib/mysql/full-cluster-crash ]]; then
 	echo "MySQL pods will be up and running in read only mode."
 	echo "Latest GTID_EXECUTED on this node is ${gtid_executed}"
 	echo "If you have spec.mysql.autoRecovery disabled, wait for all pods to be up and running and connect to one of them using mysql-shell:"
-	echo "kubectl -n ${namespace} exec -it $(hostname) -- mysqlsh root:<password>@localhost"
+	echo "kubectl -n ${namespace} exec -it $FQDN -- mysqlsh root:<password>@localhost"
 	echo "and run the following command to reboot cluster:"
 	echo "dba.rebootClusterFromCompleteOutage()"
 	echo "and delete /var/lib/mysql/full-cluster-crash file in each pod."

deploy/cr.yaml

@@ -179,6 +179,11 @@ spec:
 #      loadBalancerSourceRanges:
 #        - 10.0.0.0/8
 #      type: ClusterIP
+    containerSecurityContext:
+      runAsUser: 1001
+      runAsGroup: 1001
+    podSecurityContext:
+      fsGroup: 1001
     volumeSpec:
 #      emptyDir: {}
 #      hostPath:

e2e-tests/vars.sh

@@ -16,6 +16,12 @@ if [[ -z ${MYSQL_VERSION-} && -n ${IMAGE_MYSQL-} ]]; then
 else
 	export MYSQL_VERSION=${MYSQL_VERSION:-"8.4"}
 fi
+
+# for tests
+export IMAGE_MYSQL="mysql:8.4"
+export IMAGE_ROUTER="percona/percona-mysql-router:8.4"
+export MYSQL_VERSION="8.4"
+
 export IMAGE_MYSQL=${IMAGE_MYSQL:-"perconalab/percona-server-mysql-operator:main-psmysql${MYSQL_VERSION}"}
 export IMAGE_BACKUP=${IMAGE_BACKUP:-"perconalab/percona-server-mysql-operator:main-backup${MYSQL_VERSION}"}
 export IMAGE_ORCHESTRATOR=${IMAGE_ORCHESTRATOR:-"perconalab/percona-server-mysql-operator:main-orchestrator"}

pkg/mysql/mysql.go

@@ -26,6 +26,10 @@ const (
 	CustomConfigKey       = "my.cnf"
 	configVolumeName      = "config"
 	configMountPath       = "/etc/mysql/config"
+	nodeCnfVolumeName     = "node-cnf"
+	nodeCnfMountPath      = "/etc/my.cnf.d"
+	nodeCnfConfDVolumeName = "node-cnf-conf-d"   // Oracle MySQL image uses !includedir /etc/mysql/conf.d/
+	nodeCnfConfDMountPath = "/etc/mysql/conf.d"
 	credsVolumeName       = "users"
 	mysqlshVolumeName     = "mysqlsh"
 	mysqlshMountPath      = "/.mysqlsh"
@@ -309,6 +313,23 @@ func volumes(cr *apiv1.PerconaServerMySQL) []corev1.Volume {
 		},
 	}
 
+	if cr.CompareVersion("1.1.0") >= 0 {
+		volumes = append(volumes,
+			corev1.Volume{
+				Name: nodeCnfVolumeName,
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: &corev1.EmptyDirVolumeSource{},
+				},
+			},
+			corev1.Volume{
+				Name: nodeCnfConfDVolumeName,
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: &corev1.EmptyDirVolumeSource{},
+				},
+			},
+		)
+	}
+
 	if cr.CompareVersion("0.11.0") >= 0 {
 		volumes = append(volumes, corev1.Volume{
 			Name: vaultSecretVolumeName,
@@ -616,6 +637,19 @@ func mysqldVolumeMounts(cr *apiv1.PerconaServerMySQL) []corev1.VolumeMount {
 		},
 	}
 
+	if cr.CompareVersion("1.1.0") >= 0 {
+		mounts = append(mounts,
+			corev1.VolumeMount{
+				Name:      nodeCnfVolumeName,
+				MountPath: nodeCnfMountPath,
+			},
+			corev1.VolumeMount{
+				Name:      nodeCnfConfDVolumeName,
+				MountPath: nodeCnfConfDMountPath,
+			},
+		)
+	}
+
 	if cr.CompareVersion("0.11.0") >= 0 {
 		mounts = append(mounts, corev1.VolumeMount{
 			Name:      vaultSecretVolumeName,
@@ -669,6 +703,17 @@ func mysqldContainer(cr *apiv1.PerconaServerMySQL) corev1.Container {
 	}
 	env = append(env, spec.Env...)
 
+	if cr.CompareVersion("1.1.0") >= 0 {
+		env = append(env, corev1.EnvVar{
+			Name: naming.EnvPodIP,
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: "status.podIP",
+				},
+			},
+		})
+	}
+
 	if cr.CompareVersion("0.12.0") >= 0 {
 		env = append(env, corev1.EnvVar{
 			Name:  "KEYRING_VAULT_PATH",

pkg/naming/env.go

@@ -11,4 +11,6 @@ const (
 	EnvBootstrapReadTimeout = "BOOTSTRAP_READ_TIMEOUT"
 
 	EnvBootstrapCloneTimeout = "BOOTSTRAP_CLONE_TIMEOUT"
+
+	EnvPodIP = "POD_IP"
 )