Skip to content

Commit

Permalink
Support k8s 1.23 and update dependencies (#399)
Browse files Browse the repository at this point in the history
* Support k8s 1.23 and update dependencies

Signed-off-by: Masayuki Ishii <masa213f@gmail.com>
Co-authored-by: Daichi Sakaue <yokaze.rue@gmail.com>
  • Loading branch information
masa213f and yokaze authored Apr 21, 2022
1 parent 9866285 commit 877dd6d
Show file tree
Hide file tree
Showing 19 changed files with 937 additions and 285 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Build binaries
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
Expand All @@ -21,7 +21,7 @@ jobs:
name: Small tests
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
Expand All @@ -35,7 +35,7 @@ jobs:
mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28"]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
Expand All @@ -47,10 +47,10 @@ jobs:
strategy:
matrix:
mysql-version: ["8.0.28"]
k8s-version: ["1.20.7", "1.21.2", "1.22.2"]
k8s-version: ["1.21.10", "1.22.7", "1.23.4"]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
Expand All @@ -76,10 +76,10 @@ jobs:
strategy:
matrix:
mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28"]
k8s-version: ["1.22.2"]
k8s-version: ["1.23.4"]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
Expand All @@ -104,7 +104,7 @@ jobs:
name: Upgrade Test
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-20.04
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: gh-pages

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -37,7 +37,9 @@ jobs:
uses: helm/kind-action@v1.2.0
if: steps.list-changed.outputs.changed == 'true'
with:
node_image: kindest/node:v1.22.2
version: v0.12.0
node_image: kindest/node:v1.23.4
kubectl_version: v1.23.4

- name: Apply cert-manager
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mdbook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Build book
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: make book
- uses: actions/upload-artifact@v3
with:
Expand All @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-20.04
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: gh-pages
# ignore helm chart index file and chart archive file.
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Push Container Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build images
run: |
docker build -t moco:dev --target controller .
Expand All @@ -29,18 +29,18 @@ jobs:
needs: image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
- name: GoReleaser
uses: goreleaser/goreleaser-action@v2
with:
distribution: goreleaser
version: v0.180.3
version: v1.8.2
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update new version in krew-index
# v0.0.42 https://github.com/rajatjindal/krew-release-bot/releases/tag/v0.0.42
uses: rajatjindal/krew-release-bot@ba5e167fbd1526240f5f5d2eaf1ec573fc5942de
# v0.0.43 https://github.com/rajatjindal/krew-release-bot/releases/tag/v0.0.43
uses: rajatjindal/krew-release-bot@92da038bbf995803124a8e50ebd438b2f37bbbb0
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Tool versions
CTRL_TOOLS_VERSION=0.7.0
CTRL_TOOLS_VERSION=0.8.0
CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
CODE_GENERATOR_VERSION := $(shell awk '/k8s.io\/client-go/ {print substr($$2, 2)}' go.mod)
KUSTOMIZE_VERSION = 4.4.1
HELM_VERSION = 3.7.1
KUSTOMIZE_VERSION = 4.5.4
HELM_VERSION = 3.8.1
CRD_TO_MARKDOWN_VERSION = 0.0.3
MYSQLSH_VERSION = 8.0.28-1
MDBOOK_VERSION = 0.4.13
GORELEASER_VERSION = 1.0.0
MDBOOK_VERSION = 0.4.17
GORELEASER_VERSION = 1.8.2
YQ_VERSION = 4.23.1
OS_VERSION := $(shell . /etc/os-release; echo $$VERSION_ID)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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
- Kubernetes: 1.20, 1.21, 1.22
- Kubernetes: 1.21, 1.22, 1.23

Other MySQL 8 releases would probably work. They are simply not tested in our CI.

Expand Down
2 changes: 2 additions & 0 deletions api/v1beta1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 877dd6d

Please sign in to comment.