Merge pull request #727 from cybozu-go/support-k8s-1.30

support k8s 1.30 and 1.31
cybozu-go · Sep 18, 2024 · 742ccbc · 742ccbc
2 parents 315ca63 + 3f003fe
commit 742ccbc
Show file tree

Hide file tree

Showing 35 changed files with 1,778 additions and 1,536 deletions.
diff --git a/.github/actions/e2e/action.yaml b/.github/actions/e2e/action.yaml
@@ -8,6 +8,9 @@ inputs:
  k8s-version:
  description: 'K8s version'
  required: true
+ name:
+ description: 'Name of the action'
+ required: true
 runs:
  using: "composite"
  steps:
@@ -33,8 +36,8 @@ runs:
  working-directory: e2e
  if: always()
  shell: bash
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  if: always()
  with:
- name: logs-${{ inputs.k8s-version }}-${{ inputs.mysql-version }}.tar.gz
+ name: logs-${{inputs.name}}-${{ inputs.k8s-version }}-${{ inputs.mysql-version }}.tar.gz
  path: e2e/logs.tar.gz
diff --git a/.github/actions/upgrade/action.yaml b/.github/actions/upgrade/action.yaml
@@ -25,7 +25,7 @@ runs:
  working-directory: e2e
  if: always()
  shell: bash
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  if: always()
  with:
  name: logs-upgrade.tar.gz

diff --git a/.github/workflows/build-mysql-container.yaml b/.github/workflows/build-mysql-container.yaml
@@ -45,7 +45,7 @@ jobs:
  strategy:
  matrix:
  mysql-version: ${{ fromJson(needs.filter.outputs.mysql-versions) }}
- k8s-version: [ "1.29.4" ]
+ k8s-version: [ "1.31.0" ]
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
@@ -98,7 +98,7 @@ jobs:
  - run: make logs
  working-directory: e2e
  if: always()
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  if: always()
  with:
  name: logs-${{ matrix.k8s-version }}-${{ matrix.mysql-version }}.tar.gz

diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml
@@ -20,12 +20,12 @@ 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.0.39", "8.4.2"]
  runs-on: ubuntu-22.04
  steps:
  - uses: actions/checkout@v4
  - name: Check and output changed files
- uses: tj-actions/changed-files@7fc073d92265804a8d4e4982b637dee053daf6c5 # v42.0.7
+ uses: tj-actions/changed-files@a29e8b565651ce417abb5db7164b4a2ad8b6155c # v44.4.0
  id: changed-files
  with:
  files_ignore: |
@@ -40,14 +40,14 @@ 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"]
+ mysql-version: ["8.4.2"]
+ k8s-version: ["1.29.4", "1.30.4", "1.31.0"]
  runs-on:
  group: moco
  steps:
  - uses: actions/checkout@v4
  - name: Check and output changed files
- uses: tj-actions/changed-files@7fc073d92265804a8d4e4982b637dee053daf6c5 # v42.0.7
+ uses: tj-actions/changed-files@a29e8b565651ce417abb5db7164b4a2ad8b6155c # v44.4.0
  id: changed-files
  with:
  files_ignore: |
@@ -57,20 +57,21 @@ jobs:
  with:
  k8s-version: ${{ matrix.k8s-version }}
  mysql-version: ${{ matrix.mysql-version }}
+ name: k8s-version-e2e
  if: steps.changed-files.outputs.any_changed == 'true'
 
  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"]
- k8s-version: ["1.29.4"]
+ mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.0.39", "8.4.2"]
+ k8s-version: ["1.31.0"]
  runs-on:
  group: moco
  steps:
  - uses: actions/checkout@v4
  - name: Check and output changed files
- uses: tj-actions/changed-files@7fc073d92265804a8d4e4982b637dee053daf6c5 # v42.0.7
+ uses: tj-actions/changed-files@a29e8b565651ce417abb5db7164b4a2ad8b6155c # v44.4.0
  id: changed-files
  with:
  files_ignore: |
@@ -81,6 +82,7 @@ jobs:
  with:
  k8s-version: ${{ matrix.k8s-version }}
  mysql-version: ${{ matrix.mysql-version }}
+ name: mysql-version-e2e
 
  upgrade:
  name: Upgrade Test
@@ -89,7 +91,7 @@ jobs:
  steps:
  - uses: actions/checkout@v4
  - name: Check and output changed files
- uses: tj-actions/changed-files@7fc073d92265804a8d4e4982b637dee053daf6c5 # v42.0.7
+ uses: tj-actions/changed-files@a29e8b565651ce417abb5db7164b4a2ad8b6155c # v44.4.0
  id: changed-files
  with:
  files_ignore: |

diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
@@ -15,7 +15,7 @@ jobs:
  fetch-depth: 0
 
  - name: Set up Helm
- uses: azure/setup-helm@v3
+ uses: azure/setup-helm@v4
  with:
  version: v3.10.2
 
@@ -30,7 +30,7 @@ jobs:
  - name: Packaging the chart
  run: helm package ./charts/moco/
 
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  with:
  name: helm-charts
  path: ./moco-*.tgz
@@ -46,11 +46,11 @@ jobs:
  ref: gh-pages
 
  - name: Set up Helm
- uses: azure/setup-helm@v3
+ uses: azure/setup-helm@v4
  with:
  version: v3.15.0
 
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
  with:
  name: helm-charts
 

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -16,7 +16,7 @@ jobs:
  with:
  fetch-depth: 0
 
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  with:
  python-version: 3.7
 
@@ -34,12 +34,12 @@ jobs:
  run: ct lint --config ct.yaml
 
  - name: Create kind cluster
- uses: helm/kind-action@v1.8.0
+ uses: helm/kind-action@v1.10.0
  if: steps.list-changed.outputs.changed == 'true'
  with:
  version: v0.23.0
- node_image: kindest/node:v1.29.4
- kubectl_version: v1.29.4
+ node_image: kindest/node:v1.31.0
+ kubectl_version: v1.31.0
 
  - name: Apply cert-manager
  run: |

diff --git a/.github/workflows/mdbook.yaml b/.github/workflows/mdbook.yaml
@@ -11,7 +11,7 @@ jobs:
  steps:
  - uses: actions/checkout@v4
  - run: make book
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  with:
  name: book
  path: docs/book
@@ -26,7 +26,7 @@ jobs:
  ref: gh-pages
  # ignore helm chart index file and chart archive file.
  - run: ls | grep -v -E 'index.yaml|moco-.*\.tgz' | xargs rm -rf
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
  with:
  name: book
  - run: ls -R

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -100,4 +100,4 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  - name: Update new version in krew-index
  # v0.0.43 https://github.com/rajatjindal/krew-release-bot/releases/tag/v0.0.43
- uses: rajatjindal/krew-release-bot@92da038bbf995803124a8e50ebd438b2f37bbbb0
+ uses: rajatjindal/krew-release-bot@df3eb197549e3568be8b4767eec31c5e8e8e6ad8 # v0.0.46
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Update fluent-bit image to 3.1.7 [#738](https://github.com/cybozu-go/moco/pull/738)
+- Add support for k8s 1.30 and 1.31 [#727](https://github.com/cybozu-go/moco/pull/727)
 
 ## [0.23.2] - 2024-07-02
 

diff --git a/DEVELOP.md b/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,23 +84,23 @@ 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.0.39", "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"]
- k8s-version: ["1.27.13", "1.28.9", "1.29.4"]
+ 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"]
- k8s-version: ["1.29.4"]
+ mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.0.39", "8.4.2"]
+ k8s-version: ["1.31.0"]
 ```
 
 ## Updating moco-agent

diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
 # Tool versions
-CTRL_TOOLS_VERSION=0.15.0
+CTRL_TOOLS_VERSION=0.16.2
 CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
-KUSTOMIZE_VERSION = 5.4.1
-HELM_VERSION = 3.15.0
+KUSTOMIZE_VERSION = 5.4.3
+HELM_VERSION = 3.15.4
 CRD_TO_MARKDOWN_VERSION = 0.0.3
 MYSQLSH_VERSION = 8.4.0-1
-MDBOOK_VERSION = 0.4.37
-GORELEASER_VERSION = 1.26.1
-YQ_VERSION = 4.44.1
+MDBOOK_VERSION = 0.4.40
+GORELEASER_VERSION = 1.26.2
+YQ_VERSION = 4.44.3
 OS_VERSION := $(shell . /etc/os-release; echo $$VERSION_ID)
 
 # Test tools

diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ 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
-- Kubernetes: 1.27, 1.28, 1.29
+- MySQL: 8.0.28, 8.0.36, 8.0.37, 8.0.39, 8.4.2
+- Kubernetes: 1.29, 1.30, 1.31
 
 MOCO supports (tests) the LTS releases of MySQL 8.
 Innovation releases would probably work. But they are not tested in our CI.
@@ -74,7 +74,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