Skip to content

Commit

Permalink
Merge pull request #617 from cybozu-go/using-mysql8035
Browse files Browse the repository at this point in the history
Support MySQL 8.0.35
  • Loading branch information
yamatcha authored Dec 6, 2023
2 parents d035963 + 0b51171 commit 2002045
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
name: Integration tests with MySQL
strategy:
matrix:
mysql-version: ["8.0.28", "8.0.33", "8.0.34"]
mysql-version: ["8.0.28", "8.0.34", "8.0.35"]
uses: ./.github/workflows/dbtest.yaml
with:
mysql-version: ${{ matrix.mysql-version }}
Expand All @@ -39,7 +39,7 @@ jobs:
name: Supported Kubernetes versions End-to-End Tests
strategy:
matrix:
mysql-version: ["8.0.34"]
mysql-version: ["8.0.35"]
k8s-version: ["1.25.9", "1.26.4", "1.27.1"]
uses: ./.github/workflows/e2e.yaml
with:
Expand All @@ -50,7 +50,7 @@ jobs:
name: Supported MySQL versions End-to-End Tests
strategy:
matrix:
mysql-version: ["8.0.28", "8.0.33", "8.0.34"]
mysql-version: ["8.0.28", "8.0.34", "8.0.35"]
k8s-version: ["1.27.1"]
uses: ./.github/workflows/e2e.yaml
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
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"]
uses: ./.github/workflows/dbtest.yaml
with:
mysql-version: ${{ matrix.mysql-version }}
Expand All @@ -26,7 +26,7 @@ jobs:
name: Supported Kubernetes versions End-to-End Tests
strategy:
matrix:
mysql-version: ["8.0.34"]
mysql-version: ["8.0.35"]
k8s-version: ["1.25.9", "1.26.4", "1.27.1"]
uses: ./.github/workflows/e2e.yaml
with:
Expand All @@ -37,7 +37,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"]
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.27.1"]
uses: ./.github/workflows/e2e.yaml
with:
Expand Down
10 changes: 5 additions & 5 deletions DEVELOP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.34.1 as mysql
FROM ghcr.io/cybozu-go/moco/mysql:8.0.35.1 as mysql
# See the below description for how to get the version string.
ARG MYSQLSH_VERSION=8.0.34-1
ARG MYSQLSH_VERSION=8.0.35-1
```

The MySQL shell debian package can be found in https://dev.mysql.com/downloads/shell/ .
Expand All @@ -88,22 +88,22 @@ 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"]
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"]
...
# 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.34"]
mysql-version: ["8.0.35"]
k8s-version: ["1.19.11", "1.20.7", "1.21.1"]
...
# 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"]
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"]
```
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ USER 10000:10000
ENTRYPOINT ["/moco-controller"]

# For MySQL binaries
FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.0.34.1 as mysql
FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.0.35.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.34-1
ARG MYSQLSH_VERSION=8.0.35-1

COPY --from=builder /work/moco-backup /moco-backup

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print su
KUSTOMIZE_VERSION = 5.2.1
HELM_VERSION = 3.13.2
CRD_TO_MARKDOWN_VERSION = 0.0.3
MYSQLSH_VERSION = 8.0.34-1
MYSQLSH_VERSION = 8.0.35-1
MDBOOK_VERSION = 0.4.36
GORELEASER_VERSION = 1.22.1
YQ_VERSION = 4.40.4
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- 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
- Kubernetes: 1.25, 1.26, 1.27

MOCO supports (tests) the LTS releases of MySQL 8.
Expand Down Expand Up @@ -74,7 +74,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
volumeClaimTemplates:
- metadata:
name: mysql-data
Expand Down
2 changes: 1 addition & 1 deletion docs/custom-mysqld.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
```
If you want to build and use your own `mysqld`, read the rest of this document.
Expand Down
6 changes: 3 additions & 3 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
containers:
# At least a container named "mysqld" must be defined.
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
# 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:
Expand Down Expand Up @@ -207,7 +207,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34 # must be the same version as the donor
image: ghcr.io/cybozu-go/moco/mysql:8.0.35 # must be the same version as the donor
volumeClaimTemplates:
- metadata:
name: mysql-data
Expand Down Expand Up @@ -695,7 +695,7 @@ spec:
containers:
- name: mysqld
# Edit the next line
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
```

You are advised to make backups and/or create a replica cluster before starting the upgrade process.
Expand Down
2 changes: 1 addition & 1 deletion e2e/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KIND_VERSION = 0.20.0
KUBERNETES_VERSION = 1.27.1
CERT_MANAGER_VERSION = 1.13.2
MYSQL_VERSION = 8.0.34
MYSQL_VERSION = 8.0.35

KIND := $(dir $(shell pwd))/bin/kind
KUBECTL := $(dir $(shell pwd))/bin/kubectl
Expand Down
2 changes: 1 addition & 1 deletion examples/anti-affinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
resources:
requests:
cpu: "10"
Expand Down
2 changes: 1 addition & 1 deletion examples/collect-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
volumeClaimTemplates:
- metadata:
name: mysql-data
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-mycnf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
volumeClaimTemplates:
- metadata:
name: mysql-data
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-probe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
# If you want to override the default probes, you cannot override the httpGet.
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion examples/guaranteed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
# 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:
Expand Down
2 changes: 1 addition & 1 deletion examples/loadbalancer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: mysqld
image: ghcr.io/cybozu-go/moco/mysql:8.0.34
image: ghcr.io/cybozu-go/moco/mysql:8.0.35
volumeClaimTemplates:
- metadata:
name: mysql-data
Expand Down

0 comments on commit 2002045

Please sign in to comment.