Merge pull request #755 from cybozu-go/issue-753

update test matrix and documents

.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.0.39", "8.4.2"]
+        mysql-version: ["8.0.28", "8.0.37", "8.0.39", "8.0.40", "8.4.3"]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     name: Supported Kubernetes versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.4.2"]
+        mysql-version: ["8.4.3"]
         k8s-version: ["1.29.4", "1.30.4", "1.31.0"]
     runs-on:
       group: moco
@@ -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.0.39", "8.4.2"]
+        mysql-version: ["8.0.28", "8.0.37", "8.0.39", "8.0.40", "8.4.3"]
         k8s-version: ["1.31.0"]
     runs-on:
       group: moco

DEVELOP.md

@@ -54,10 +54,10 @@ Edit the following lines in `Dockerfile`:
 
 ```
 # The tag should be the latest one
-FROM ghcr.io/cybozu-go/moco/mysql:8.4.2.1 as mysql
+FROM ghcr.io/cybozu-go/moco/mysql:8.4.3.1 as mysql
 
 # See the below description for how to get the version string.
-ARG MYSQLSH_VERSION=8.4.0-1
+ARG MYSQLSH_VERSION=8.4.3-1
 ```
 
 The MySQL shell debian package can be found in https://dev.mysql.com/downloads/shell/ .
@@ -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.0.39", "8.4.2"]
+        mysql-version: ["8.0.28", "8.0.37", "8.0.39", "8.0.40", "8.4.3"]
 ...
   # 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.2"]
+        mysql-version: ["8.4.3"]
         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.0.39", "8.4.2"]
+        mysql-version: ["8.0.28", "8.0.37", "8.0.39", "8.0.40", "8.4.3"]
         k8s-version: ["1.31.0"]
 ```
 

Dockerfile

@@ -20,13 +20,13 @@ USER 10000:10000
 ENTRYPOINT ["/moco-controller"]
 
 # For MySQL binaries
-FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.4.0.1 as mysql
+FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.4.3.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.4.0
+ARG MYSQLSH_VERSION=8.4.3
 ARG MYSQLSH_GLIBC_VERSION=2.28
 ARG TARGETARCH
 

Makefile

@@ -4,7 +4,7 @@ CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print su
 KUSTOMIZE_VERSION = 5.4.3
 HELM_VERSION = 3.15.4
 CRD_TO_MARKDOWN_VERSION = 0.0.3
-MYSQLSH_VERSION = 8.4.0-1
+MYSQLSH_VERSION = 8.4.3-1
 MDBOOK_VERSION = 0.4.40
 GORELEASER_VERSION = 1.26.2
 YQ_VERSION = 4.44.3

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.0.39, 8.4.2
+- MySQL: 8.0.28, 8.0.37, 8.0.39, 8.0.40, 8.4.3
 - Kubernetes: 1.29, 1.30, 1.31
 
 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.4.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
   volumeClaimTemplates:
   - metadata:
       name: mysql-data

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.2
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.3
     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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
 ```
 
 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.2.tar.gz
-$ tar -x -z -f mysql-8.4.2.tar.gz
-$ cd mysql-8.4.2
+$ curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.3.tar.gz
+$ tar -x -z -f mysql-8.4.3.tar.gz
+$ cd mysql-8.4.3
 $ mkdir bld
 $ cd bld
 $ cmake .. -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Release \

docs/customize-system-container.md

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.0.30
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
     overwriteContainers:
     - name: agent
       resources:

docs/designdoc/allow_customize_containers.md

@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
     overwriteContainers:
     - name: agent
       resources:
@@ -95,7 +95,7 @@ spec:
     spec:
       containers:
       - name: mysqld
-        image: ghcr.io/cybozu-go/moco/mysql:8.4.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
     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.2
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.3
     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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
         # 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.2  # must be the same version as the donor
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3  # 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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
 ```
 
 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.3
-MYSQL_VERSION = 8.4.2
+MYSQL_VERSION = 8.4.3
 
 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.2"
+	mysqlVersionNew = "8.4.3"
 )
 
 var _ = Context("upgrade", Ordered, 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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
         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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
   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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
   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.2
+          image: ghcr.io/cybozu-go/moco/mysql:8.4.3
           # 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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
         # 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.2
+        image: ghcr.io/cybozu-go/moco/mysql:8.4.3
   volumeClaimTemplates:
   - metadata:
       name: mysql-data