Skip to content

Commit 0252543

Browse files
authored
Merge pull request #770 from cybozu-go/update-k8s-132
Update k8s 1.32
2 parents a5ff196 + 391fe77 commit 0252543

21 files changed

+3283
-3617
lines changed

.github/workflows/build-mysql-container.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
matrix:
4747
mysql-version: ${{ fromJson(needs.filter.outputs.mysql-versions) }}
48-
k8s-version: [ "1.31.0" ]
48+
k8s-version: [ "1.32.0" ]
4949
steps:
5050
- uses: actions/checkout@v4
5151
- uses: actions/setup-go@v5

.github/workflows/ci-e2e.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
matrix:
4343
mysql-version: ["8.4.4"]
44-
k8s-version: ["1.29.4", "1.30.4", "1.31.0"]
44+
k8s-version: ["1.30.4", "1.31.0", "1.32.0"]
4545
runs-on:
4646
group: moco
4747
steps:
@@ -65,7 +65,7 @@ jobs:
6565
strategy:
6666
matrix:
6767
mysql-version: ["8.0.28", "8.0.39", "8.0.40", "8.0.41", "8.4.4"]
68-
k8s-version: ["1.31.0"]
68+
k8s-version: ["1.32.0"]
6969
runs-on:
7070
group: moco
7171
steps:

.github/workflows/helm.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
- uses: actions/setup-python@v5
2020
with:
21-
python-version: 3.7
21+
python-version: 3.8
2222

2323
- name: Set up chart-testing
24-
uses: helm/chart-testing-action@v2.6.1
24+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
2525

2626
- name: Run chart-testing (list-changed)
2727
id: list-changed
@@ -34,12 +34,12 @@ jobs:
3434
run: ct lint --config ct.yaml
3535

3636
- name: Create kind cluster
37-
uses: helm/kind-action@v1.10.0
37+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
3838
if: steps.list-changed.outputs.changed == 'true'
3939
with:
4040
version: v0.23.0
41-
node_image: kindest/node:v1.31.0
42-
kubectl_version: v1.31.0
41+
node_image: kindest/node:v1.32.0
42+
kubectl_version: v1.32.0
4343
config: e2e/kind-config.yaml
4444

4545
- name: Apply cert-manager

DEVELOP.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ MySQL versions appear twice:
9292
strategy:
9393
matrix:
9494
mysql-version: ["8.4.4"]
95-
k8s-version: ["1.29.4", "1.30.4", "1.31.0"]
95+
k8s-version: ["1.30.4", "1.31.0", "1.32.0"]
9696
...
9797
# Matrix tests for different MySQL versions on the latest supported Kubernetes version.
9898
e2e-mysql:
9999
name: Supported MySQL versions End-to-End Tests
100100
strategy:
101101
matrix:
102102
mysql-version: ["8.0.28", "8.0.39", "8.0.40", "8.0.41", "8.4.4"]
103-
k8s-version: ["1.31.0"]
103+
k8s-version: ["1.32.0"]
104104
```
105105
106106
## Updating moco-agent

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the moco-controller binary
2-
FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.22-jammy as builder
2+
FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.23-jammy as builder
33

44
ARG TARGETARCH
55

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tool versions
2-
CTRL_TOOLS_VERSION=0.16.2
2+
CTRL_TOOLS_VERSION=0.17.0
33
CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
44
KUSTOMIZE_VERSION = 5.4.3
55
HELM_VERSION = 3.15.4

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Blog article: [Introducing MOCO, a modern MySQL operator on Kubernetes](https://
2727
## Supported software
2828

2929
- MySQL: 8.0.28, 8.0.39, 8.0.40, 8.0.41, 8.4.4
30-
- Kubernetes: 1.29, 1.30, 1.31
30+
- Kubernetes: 1.30, 1.31, 1.32
3131

3232
MOCO supports (tests) the LTS releases of MySQL 8.
3333
Innovation releases would probably work. But they are not tested in our CI.

charts/moco/templates/_helpers.tpl

-11
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,3 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
2323
{{- end }}
2424
app.kubernetes.io/managed-by: {{ .Release.Service }}
2525
{{- end }}
26-
27-
{{/*
28-
Return the appropriate apiVersion for admissionregistration.
29-
*/}}
30-
{{- define "admissionregistration.apiVersion" -}}
31-
{{- if (lt (int .Capabilities.KubeVersion.Minor) 30) -}}
32-
admissionregistration.k8s.io/v1beta1
33-
{{- else -}}
34-
admissionregistration.k8s.io/v1
35-
{{- end }}
36-
{{- end }}

charts/moco/templates/generated/crds/moco_crds.yaml

+916-881
Large diffs are not rendered by default.

charts/moco/templates/generated/generated.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ spec:
372372
app.kubernetes.io/component: moco-controller
373373
app.kubernetes.io/name: '{{ include "moco.name" . }}'
374374
---
375-
apiVersion: '{{ include "admissionregistration.apiVersion" . }}'
375+
apiVersion: admissionregistration.k8s.io/v1
376376
kind: ValidatingAdmissionPolicy
377377
metadata:
378378
labels:
@@ -400,7 +400,7 @@ spec:
400400
!(oldObject.metadata.annotations["moco.cybozu.com/prevent-delete"] == "true")
401401
messageExpression: oldObject.metadata.name + ' is protected from deletion'
402402
---
403-
apiVersion: '{{ include "admissionregistration.apiVersion" . }}'
403+
apiVersion: admissionregistration.k8s.io/v1
404404
kind: ValidatingAdmissionPolicyBinding
405405
metadata:
406406
labels:

0 commit comments

Comments
 (0)