issue-686: support MySQL 8.4.0

cybozu-go · Jun 12, 2024 · 165f020 · 165f020
1 parent 52c7caa
commit 165f020
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 38 deletions.
diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml
@@ -24,7 +24,7 @@ jobs:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.35", "8.0.36", "8.0.37"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -44,7 +44,7 @@ jobs:
     name: Supported Kubernetes versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.37"]
+        mysql-version: ["8.4.0"]
         k8s-version: ["1.27.13", "1.28.9", "1.29.4"]
     runs-on:
       group: moco
@@ -67,7 +67,7 @@ jobs:
     name: Supported MySQL versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.35", "8.0.36", "8.0.37"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37"]
         k8s-version: ["1.29.4"]
     runs-on:
       group: moco

diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml
@@ -17,7 +17,7 @@ jobs:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35", "8.0.36", "8.0.37"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
     name: Supported Kubernetes versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.37"]
+        mysql-version: ["8.4.0"]
         k8s-version: ["1.27.13", "1.28.9", "1.29.4"]
     runs-on:
       group: moco
@@ -44,7 +44,7 @@ jobs:
     name: Supported MySQL versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35", "8.0.36", "8.0.37"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
         k8s-version: ["1.29.4"]
     runs-on:
       group: moco

diff --git a/DEVELOP.md b/DEVELOP.md
@@ -58,10 +58,10 @@ Edit the following lines in `Dockerfile`:
 
 ```
 # The tag should be the latest one
-FROM ghcr.io/cybozu-go/moco/mysql:8.0.35.1 as mysql
+FROM ghcr.io/cybozu-go/moco/mysql:8.4.0.1 as mysql
 
 # See the below description for how to get the version string.
-ARG MYSQLSH_VERSION=8.0.35-1
+ARG MYSQLSH_VERSION=8.4.0-1
 ```
 
 The MySQL shell debian package can be found in https://dev.mysql.com/downloads/shell/ .
@@ -88,23 +88,23 @@ MySQL versions appear twice:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
 ...
   # Matrix tests for the latest MySQL version on different Kubernetes versions.
   e2e:
     name: Supported Kubernetes versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.35"]
-        k8s-version: ["1.19.11", "1.20.7", "1.21.1"]
+        mysql-version: ["8.4.0"]
+        k8s-version: ["1.27.13", "1.28.9", "1.29.4"]
 ...
   # Matrix tests for different MySQL versions on the latest supported Kubernetes version.
   e2e-mysql:
     name: Supported MySQL versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35"]
-        k8s-version: ["1.21.1"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
+        k8s-version: ["1.29.4"]
 ```
 
 ## Updating moco-agent

diff --git a/Dockerfile b/Dockerfile
@@ -20,13 +20,13 @@ USER 10000:10000
 ENTRYPOINT ["/moco-controller"]
 
 # For MySQL binaries
-FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.0.37.1 as mysql
+FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.4.0.1 as mysql
 
 # the backup image
 FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu:22.04
 LABEL org.opencontainers.image.source https://github.com/cybozu-go/moco
 
-ARG MYSQLSH_VERSION=8.0.37
+ARG MYSQLSH_VERSION=8.4.0
 ARG MYSQLSH_GLIBC_VERSION=2.28
 ARG TARGETARCH
 
@@ -41,7 +41,7 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/* \
   && if [ "${TARGETARCH}" = 'amd64' ]; then MYSQLSH_ARCH='x86-64'; fi \
   && if [ "${TARGETARCH}" = 'arm64' ]; then MYSQLSH_ARCH='arm-64'; fi \
-  && curl -o /tmp/mysqlsh.tar.gz -fsL "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${MYSQLSH_VERSION}-linux-glibc${MYSQLSH_GLIBC_VERSION}-${MYSQLSH_ARCH:-unknown}bit.tar.gz" \
+  && curl -o /tmp/mysqlsh.tar.gz -fsL "https://cdn.mysql.com/Downloads/MySQL-Shell/mysql-shell-${MYSQLSH_VERSION}-linux-glibc${MYSQLSH_GLIBC_VERSION}-${MYSQLSH_ARCH:-unknown}bit.tar.gz" \
   && mkdir /usr/local/mysql-shell \
   && tar -xf /tmp/mysqlsh.tar.gz -C /usr/local/mysql-shell --strip-components=1 \
   && rm -f /tmp/mysqlsh.tar.gz

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print su
 KUSTOMIZE_VERSION = 5.4.1
 HELM_VERSION = 3.15.0
 CRD_TO_MARKDOWN_VERSION = 0.0.3
-MYSQLSH_VERSION = 8.0.37-1
+MYSQLSH_VERSION = 8.4.0-1
 MDBOOK_VERSION = 0.4.37
 GORELEASER_VERSION = 1.26.1
 YQ_VERSION = 4.44.1

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Blog article: [Introducing MOCO, a modern MySQL operator on Kubernetes](https://
 
 ## Supported software
 
-- MySQL: 8.0.18, 8.0.25, 8.0.26, 8.0.27, 8.0.28, 8.0.30, 8.0.31, 8.0.32, 8.0.33, 8.0.34, 8.0.35, 8.0.36, 8.0.37
+- MySQL: 8.0.28, 8.0.36, 8.0.37, 8.4.0
 - Kubernetes: 1.27, 1.28, 1.29
 
 MOCO supports (tests) the LTS releases of MySQL 8.
@@ -74,7 +74,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.37
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

diff --git a/docs/custom-mysqld.md b/docs/custom-mysqld.md
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
 ```
 
 If you want to build and use your own `mysqld`, read the rest of this document.
@@ -29,19 +29,19 @@ You should keep the following points:
 
 ## How to build `mysqld`
 
-On Ubuntu 20.04, you can build the source code as follows:
+On Ubuntu 22.04, you can build the source code as follows:
 
 ```console
 $ sudo apt-get update
 $ sudo apt-get -y --no-install-recommends install build-essential libssl-dev \
     cmake libncurses5-dev libjemalloc-dev libnuma-dev libaio-dev pkg-config
-$ curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.20.tar.gz
-$ tar -x -z -f mysql-boost-8.0.20.tar.gz
-$ cd mysql-8.0.20
+$ curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.0.tar.gz
+$ tar -x -z -f mysql-8.4.0.tar.gz
+$ cd mysql-8.4.0
 $ mkdir bld
 $ cd bld
 $ cmake .. -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_BOOST=$(ls -d ../boost/boost_*) -DWITH_NUMA=1 -DWITH_JEMALLOC=1
+    -DWITH_NUMA=1 -DWITH_JEMALLOC=1
 $ make -j $(nproc)
 $ make install
 ```
diff --git a/docs/usage.md b/docs/usage.md
@@ -100,7 +100,7 @@ spec:
       containers:
       # At least a container named "mysqld" must be defined.
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
         # By limiting CPU and memory, Pods will have Guaranteed QoS class.
         # requests can be omitted; it will be set to the same value as limits.
         resources:
@@ -208,7 +208,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35  # must be the same version as the donor
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0  # must be the same version as the donor
   volumeClaimTemplates:
   - metadata:
       name: mysql-data
@@ -727,7 +727,7 @@ spec:
       containers:
       - name: mysqld
         # Edit the next line
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
 ```
 
 You are advised to make backups and/or create a replica cluster before starting the upgrade process.

diff --git a/e2e/Makefile b/e2e/Makefile
@@ -1,7 +1,7 @@
 KIND_VERSION = 0.23.0
 KUBERNETES_VERSION = 1.29.4
 CERT_MANAGER_VERSION = 1.14.5
-MYSQL_VERSION = 8.0.37
+MYSQL_VERSION = 8.4.0
 
 KIND := $(dir $(shell pwd))/bin/kind
 KUBECTL := $(dir $(shell pwd))/bin/kubectl

diff --git a/e2e/upgrade_test.go b/e2e/upgrade_test.go
@@ -19,8 +19,8 @@ import (
 var upgradeYAML string
 
 const (
-	mysqlVersionOld = "8.0.18"
-	mysqlVersionNew = "8.0.25"
+	mysqlVersionOld = "8.0.28"
+	mysqlVersionNew = "8.4.0"
 )
 
 var _ = Context("upgrade", func() {

diff --git a/examples/anti-affinity.yaml b/examples/anti-affinity.yaml
@@ -26,7 +26,7 @@ spec:
             topologyKey: "kubernetes.io/hostname"
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
         resources:
           requests:
             cpu: "10"

diff --git a/examples/collect-metrics.yaml b/examples/collect-metrics.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

diff --git a/examples/custom-mycnf.yaml b/examples/custom-mycnf.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

diff --git a/examples/custom-probe.yaml b/examples/custom-probe.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
         - name: mysqld
-          image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.0
           # If you want to override the default probes, you cannot override the httpGet.
           livenessProbe:
             failureThreshold: 3

diff --git a/examples/guaranteed.yaml b/examples/guaranteed.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
         # By limiting CPU and memory, Pods will have Guaranteed QoS class.
         # requests can be omitted; it will be set to the same value as limits.
         resources:

diff --git a/examples/loadbalancer.yaml b/examples/loadbalancer.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.35
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

diff --git a/pkg/bkop/operator_test.go b/pkg/bkop/operator_test.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/cybozu-go/moco/pkg/constants"
@@ -76,7 +77,13 @@ var _ = Describe("Operator", func() {
 		opRe.(operator).db.MustExec(`DROP USER 'root'@'localhost'`)
 		opRe.(operator).db.MustExec(`DROP USER 'root'@'%'`)
 		opRe.(operator).db.MustExec(`FLUSH LOCAL PRIVILEGES`)
-		opRe.(operator).db.MustExec(`RESET MASTER`)
+
+		mysqlVersion := os.Getenv("MYSQL_VERSION")
+		if strings.HasPrefix(mysqlVersion, "8.4") {
+			opRe.(operator).db.MustExec(`RESET BINARY LOGS AND GTIDS`)
+		} else {
+			opRe.(operator).db.MustExec(`RESET MASTER`)
+		}
 		opRe.(operator).db.MustExec(`SET GLOBAL super_read_only=1`)
 
 		baseDir, err = os.MkdirTemp("", "")