Skip to content

Commit de4a65f

Browse files
committed
update document and example code
1 parent 723b1e7 commit de4a65f

17 files changed

Lines changed: 32 additions & 32 deletions

DEVELOP.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ Edit the following lines in `Dockerfile`:
6161

6262
```
6363
# The tag should be the latest one
64-
FROM ghcr.io/cybozu-go/moco/mysql:8.4.5.1 as mysql
64+
FROM ghcr.io/cybozu-go/moco/mysql:8.4.6.1 as mysql
6565
6666
# See the below description for how to get the version string.
67-
ARG MYSQLSH_VERSION=8.4.5-1
67+
ARG MYSQLSH_VERSION=8.4.6-1
6868
```
6969

7070
The MySQL shell debian package can be found in https://dev.mysql.com/downloads/shell/ .
@@ -91,22 +91,22 @@ MySQL versions appear twice:
9191
name: Integration tests with MySQL
9292
strategy:
9393
matrix:
94-
mysql-version: ["8.0.28", "8.0.40", "8.0.41", "8.0.42", "8.4.4", "8.4.5"]
94+
mysql-version: ["8.0.28", "8.0.41", "8.0.42", "8.0.43", "8.4.4", "8.4.6"]
9595
...
9696
# Matrix tests for the latest MySQL version on different Kubernetes versions.
9797
e2e:
9898
name: Supported Kubernetes versions End-to-End Tests
9999
strategy:
100100
matrix:
101-
mysql-version: ["8.4.5"]
101+
mysql-version: ["8.4.6"]
102102
k8s-version: ["1.30.4", "1.31.0", "1.32.0"]
103103
...
104104
# Matrix tests for different MySQL versions on the latest supported Kubernetes version.
105105
e2e-mysql:
106106
name: Supported MySQL versions End-to-End Tests
107107
strategy:
108108
matrix:
109-
mysql-version: ["8.0.28", "8.0.40", "8.0.41", "8.0.42", "8.4.4", "8.4.5"]
109+
mysql-version: ["8.0.28", "8.0.41", "8.0.42", "8.0.43", "8.4.4", "8.4.6"]
110110
k8s-version: ["1.32.0"]
111111
```
112112

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ USER 10000:10000
2020
ENTRYPOINT ["/moco-controller"]
2121

2222
# For MySQL binaries
23-
FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.4.5.1 as mysql
23+
FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.4.6.1 as mysql
2424

2525
# the backup image
2626
FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu:22.04
2727
LABEL org.opencontainers.image.source https://github.com/cybozu-go/moco
2828

29-
ARG MYSQLSH_VERSION=8.4.5
29+
ARG MYSQLSH_VERSION=8.4.6
3030
ARG MYSQLSH_GLIBC_VERSION=2.28
3131
ARG TARGETARCH
3232

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tool versions
2-
MYSQLSH_VERSION = 8.4.5-1
2+
MYSQLSH_VERSION = 8.4.6-1
33
OS_VERSION := $(shell . /etc/os-release; echo $$VERSION_ID)
44

55
# Test tools

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Blog article: [Introducing MOCO, a modern MySQL operator on Kubernetes](https://
2626

2727
## Supported software
2828

29-
- MySQL: 8.0.28, 8.0.40, 8.0.41, 8.0.42, 8.4.4, 8.4.5
29+
- MySQL: 8.0.28, 8.0.41, 8.0.42, 8.0.43, 8.4.4, 8.4.6
3030
- Kubernetes: 1.30, 1.31, 1.32
3131

3232
MOCO supports (tests) the LTS releases of MySQL 8.
@@ -75,7 +75,7 @@ spec:
7575
spec:
7676
containers:
7777
- name: mysqld
78-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
78+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
7979
volumeClaimTemplates:
8080
- metadata:
8181
name: mysql-data

docs/change-pvc-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ For example, the user modifies the `.spec.volumeClaimTemplates` of the MySQLClus
9393
spec:
9494
containers:
9595
- name: mysqld
96-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
96+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
9797
volumeClaimTemplates:
9898
- metadata:
9999
name: mysql-data

docs/custom-mysqld.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
spec:
1212
containers:
1313
- name: mysqld
14-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
14+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
1515
```
1616
1717
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:
2929

3030
## How to build `mysqld`
3131

32-
On Ubuntu 22.04, you can build the source code as follows:
32+
On Ubuntu 24.04, you can build the source code as follows:
3333

3434
```console
3535
$ sudo apt-get update
3636
$ sudo apt-get -y --no-install-recommends install build-essential libssl-dev \
37-
cmake libncurses5-dev libjemalloc-dev libnuma-dev libaio-dev pkg-config
38-
$ curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.5.tar.gz
39-
$ tar -x -z -f mysql-8.4.5.tar.gz
40-
$ cd mysql-8.4.5
37+
cmake libncurses5-dev libgoogle-perftools-dev libnuma-dev libaio-dev pkg-config libtirpc-dev
38+
$ curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.6.tar.gz
39+
$ tar -x -z -f mysql-8.4.6.tar.gz
40+
$ cd mysql-8.4.6
4141
$ mkdir bld
4242
$ cd bld
4343
$ cmake .. -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Release \
44-
-DWITH_NUMA=1 -DWITH_JEMALLOC=1
44+
-DWITH_NUMA=1 -DWITH_TCMALLOC=1
4545
$ make -j $(nproc)
4646
$ make install
4747
```

docs/customize-system-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
spec:
1919
containers:
2020
- name: mysqld
21-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
21+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
2222
overwriteContainers:
2323
- name: agent
2424
resources:

docs/designdoc/allow_customize_containers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
spec:
3333
containers:
3434
- name: mysqld
35-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
35+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
3636
overwriteContainers:
3737
- name: agent
3838
resources:
@@ -95,7 +95,7 @@ spec:
9595
spec:
9696
containers:
9797
- name: mysqld
98-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
98+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
9999
overwriteContainers:
100100
agent:
101101
resources:

docs/designdoc/support_reduce_volume_size.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ For example, the user modifies the `.spec.volumeClaimTemplates` of the MySQLClus
4545
spec:
4646
containers:
4747
- name: mysqld
48-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
48+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
4949
volumeClaimTemplates:
5050
- metadata:
5151
name: mysql-data

docs/usage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
containers:
102102
# At least a container named "mysqld" must be defined.
103103
- name: mysqld
104-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
104+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
105105
# By limiting CPU and memory, Pods will have Guaranteed QoS class.
106106
# requests can be omitted; it will be set to the same value as limits.
107107
resources:
@@ -209,7 +209,7 @@ spec:
209209
spec:
210210
containers:
211211
- name: mysqld
212-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5 # must be the same version as the donor
212+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6 # must be the same version as the donor
213213
volumeClaimTemplates:
214214
- metadata:
215215
name: mysql-data
@@ -728,7 +728,7 @@ spec:
728728
containers:
729729
- name: mysqld
730730
# Edit the next line
731-
image: ghcr.io/cybozu-go/moco/mysql:8.4.5
731+
image: ghcr.io/cybozu-go/moco/mysql:8.4.6
732732
```
733733

734734
You are advised to make backups and/or create a replica cluster before starting the upgrade process.

0 commit comments

Comments
 (0)