support mysql 8.4.2

.github/workflows/ci-e2e.yaml

@@ -20,7 +20,7 @@ jobs:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0", "8.4.2"]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -40,8 +40,8 @@ jobs:
     name: Supported Kubernetes versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.4.0"]
-        k8s-version: ["1.27.13", "1.28.9", "1.29.4", "1.30.4"]
+        mysql-version: ["8.4.2"]
+        k8s-version: ["1.29.4", "1.30.4", "1.31.0"]
     runs-on:
       group: moco
     steps:
@@ -64,7 +64,7 @@ jobs:
     name: Supported MySQL versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0", "8.4.2"]
         k8s-version: ["1.31.0"]
     runs-on:
       group: moco

DEVELOP.md

@@ -54,7 +54,7 @@ Edit the following lines in `Dockerfile`:
 
 ```
 # The tag should be the latest one
-FROM ghcr.io/cybozu-go/moco/mysql:8.4.0.1 as mysql
+FROM ghcr.io/cybozu-go/moco/mysql:8.4.2.1 as mysql
 
 # See the below description for how to get the version string.
 ARG MYSQLSH_VERSION=8.4.0-1
@@ -84,22 +84,22 @@ MySQL versions appear twice:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0", "8.4.2"]
 ...
   # 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.4.0"]
+        mysql-version: ["8.4.2"]
         k8s-version: ["1.29.4", "1.30.4", "1.31.0"]
 ...
   # 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.28", "8.0.36", "8.0.37", "8.4.0"]
+        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0", "8.4.2"]
         k8s-version: ["1.31.0"]
 ```
 

README.md

@@ -26,7 +26,7 @@ Blog article: [Introducing MOCO, a modern MySQL operator on Kubernetes](https://
 
 ## Supported software
 
-- MySQL: 8.0.28, 8.0.36, 8.0.37, 8.4.0
+- MySQL: 8.0.28, 8.0.36, 8.0.37, 8.4.0, 8.4.2
 - Kubernetes: 1.29, 1.30,1.31
 
 MOCO supports (tests) the LTS releases of MySQL 8.

docs/change-pvc-template.md

@@ -93,7 +93,7 @@ For example, the user modifies the `.spec.volumeClaimTemplates` of the MySQLClus
       spec:
         containers:
         - name: mysqld
-          image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.2
     volumeClaimTemplates:
     - metadata:
         name: mysql-data

docs/custom-mysqld.md

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
 ```
 
 If you want to build and use your own `mysqld`, read the rest of this document.
@@ -35,9 +35,9 @@ On Ubuntu 22.04, you can build the source code as follows:
 $ 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.4/mysql-8.4.0.tar.gz
-$ tar -x -z -f mysql-8.4.0.tar.gz
-$ cd mysql-8.4.0
+$ curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.2.tar.gz
+$ tar -x -z -f mysql-8.4.2.tar.gz
+$ cd mysql-8.4.2
 $ mkdir bld
 $ cd bld
 $ cmake .. -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Release \

docs/designdoc/allow_customize_containers.md

@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
     overwriteContainers:
     - name: agent
       resources:
@@ -95,7 +95,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
     overwriteContainers:
       agent:
         resources:

docs/designdoc/support_reduce_volume_size.md

@@ -45,7 +45,7 @@ For example, the user modifies the `.spec.volumeClaimTemplates` of the MySQLClus
       spec:
         containers:
         - name: mysqld
-          image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.2
     volumeClaimTemplates:
     - metadata:
         name: mysql-data

docs/usage.md

@@ -101,7 +101,7 @@ spec:
       containers:
       # At least a container named "mysqld" must be defined.
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
         # 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:
@@ -209,7 +209,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0  # must be the same version as the donor
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2  # must be the same version as the donor
   volumeClaimTemplates:
   - metadata:
       name: mysql-data
@@ -728,7 +728,7 @@ spec:
       containers:
       - name: mysqld
         # Edit the next line
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
 ```
 
 You are advised to make backups and/or create a replica cluster before starting the upgrade process.

e2e/Makefile

@@ -1,7 +1,7 @@
 KIND_VERSION = 0.23.0
 KUBERNETES_VERSION = 1.31.0
 CERT_MANAGER_VERSION = 1.15.2
-MYSQL_VERSION = 8.4.0
+MYSQL_VERSION = 8.4.2
 
 KIND := $(dir $(shell pwd))/bin/kind
 KUBECTL := $(dir $(shell pwd))/bin/kubectl

e2e/upgrade_test.go

@@ -20,7 +20,7 @@ var upgradeYAML string
 
 const (
 	mysqlVersionOld = "8.0.28"
-	mysqlVersionNew = "8.4.0"
+	mysqlVersionNew = "8.4.2"
 )
 
 var _ = Context("upgrade", func() {

examples/anti-affinity.yaml

@@ -26,7 +26,7 @@ spec:
             topologyKey: "kubernetes.io/hostname"
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
         resources:
           requests:
             cpu: "10"

examples/collect-metrics.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

examples/custom-mycnf.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

examples/custom-probe.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
         - name: mysqld
-          image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.2
           # If you want to override the default probes, you cannot override the httpGet.
           livenessProbe:
             failureThreshold: 3

examples/guaranteed.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
         # 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:

examples/loadbalancer.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.0
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

go.mod

@@ -4,61 +4,61 @@ go 1.22.5
 
 require (
 	cloud.google.com/go/storage v1.43.0
-	github.com/aws/aws-sdk-go-v2 v1.30.4
-	github.com/aws/aws-sdk-go-v2/config v1.27.28
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.28
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.11
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0
-	github.com/cybozu-go/moco-agent v0.12.1
+	github.com/aws/aws-sdk-go-v2 v1.30.5
+	github.com/aws/aws-sdk-go-v2/config v1.27.33
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.32
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2
+	github.com/cybozu-go/moco-agent v0.12.2
 	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/stdr v1.2.2
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/google/go-cmp v0.6.0
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.34.1
-	github.com/prometheus/client_golang v1.20.0
+	github.com/onsi/gomega v1.34.2
+	github.com/prometheus/client_golang v1.20.3
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.55.0
+	github.com/prometheus/common v0.59.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.27.0
-	google.golang.org/api v0.192.0
-	google.golang.org/grpc v1.65.0
+	google.golang.org/api v0.197.0
+	google.golang.org/grpc v1.66.1
 	google.golang.org/protobuf v1.34.2
 	k8s.io/api v0.31.0
 	k8s.io/apimachinery v0.31.0
 	k8s.io/cli-runtime v0.31.0
 	k8s.io/client-go v0.31.0
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.31.0
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
+	k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3
 	sigs.k8s.io/controller-runtime v0.19.0
 )
 
 require (
-	cloud.google.com/go v0.115.0 // indirect
-	cloud.google.com/go/auth v0.8.1 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
+	cloud.google.com/go v0.115.1 // indirect
+	cloud.google.com/go/auth v0.9.3 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
-	cloud.google.com/go/iam v1.1.12 // indirect
+	cloud.google.com/go/iam v1.2.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 // indirect
 	github.com/aws/smithy-go v1.20.4 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
@@ -87,7 +87,7 @@ require (
 	github.com/google/s2a-go v0.1.8 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
 	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
@@ -115,26 +115,26 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
+	go.opentelemetry.io/otel v1.29.0 // indirect
+	go.opentelemetry.io/otel/metric v1.29.0 // indirect
+	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.22.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/term v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
+	google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect