Skip to content

Commit

Permalink
update dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
takara9 committed May 15, 2024
1 parent 66dd984 commit 63444b6
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-mysql-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
k8s-version: [ "1.27.1" ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache: true
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Integration tests with MySQL
strategy:
matrix:
mysql-version: ["8.0.28", "8.0.34", "8.0.35"]
mysql-version: ["8.0.35", "8.0.36", "8.0.37"]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand All @@ -44,8 +44,8 @@ jobs:
name: Supported Kubernetes versions End-to-End Tests
strategy:
matrix:
mysql-version: ["8.0.35"]
k8s-version: ["1.25.9", "1.26.4", "1.27.1"]
mysql-version: ["8.0.37"]
k8s-version: ["1.28.9", "1.29.4", "1.30.0"]
runs-on:
group: moco
steps:
Expand All @@ -67,8 +67,8 @@ jobs:
name: Supported MySQL versions End-to-End Tests
strategy:
matrix:
mysql-version: ["8.0.28", "8.0.34", "8.0.35"]
k8s-version: ["1.27.1"]
mysql-version: ["8.0.35", "8.0.36", "8.0.37"]
k8s-version: ["1.30.0"]
runs-on:
group: moco
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache: true
Expand All @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
uses: helm/[email protected]
if: steps.list-changed.outputs.changed == 'true'
with:
version: v0.19.0
node_image: kindest/node:v1.27.1
kubectl_version: v1.27.1
version: v0.23.0
node_image: kindest/node:v1.30.0
kubectl_version: v1.30.0

- name: Apply cert-manager
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: GoReleaser
Expand Down
10 changes: 5 additions & 5 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", "8.0.35"]
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", "8.0.36", "8.0.37"]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand All @@ -29,8 +29,8 @@ jobs:
name: Supported Kubernetes versions End-to-End Tests
strategy:
matrix:
mysql-version: ["8.0.35"]
k8s-version: ["1.25.9", "1.26.4", "1.27.1"]
mysql-version: ["8.0.37"]
k8s-version: ["1.28.9", "1.29.4", "1.30.0"]
runs-on:
group: moco
steps:
Expand All @@ -44,8 +44,8 @@ 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", "8.0.35"]
k8s-version: ["1.27.1"]
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", "8.0.36", "8.0.37"]
k8s-version: ["1.30.0"]
runs-on:
group: moco
steps:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the moco-controller binary
FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.21-jammy as builder
FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.22-jammy as builder

ARG TARGETARCH

Expand All @@ -20,13 +20,13 @@ USER 10000:10000
ENTRYPOINT ["/moco-controller"]

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

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

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Tool versions
CTRL_TOOLS_VERSION=0.13.0
CTRL_TOOLS_VERSION=0.15.0
CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
KUSTOMIZE_VERSION = 5.2.1
HELM_VERSION = 3.13.2
CRD_TO_MARKDOWN_VERSION = 0.0.3
MYSQLSH_VERSION = 8.0.35-1
MYSQLSH_VERSION = 8.0.37-1
MDBOOK_VERSION = 0.4.36
GORELEASER_VERSION = 1.22.1
GORELEASER_VERSION = 1.26.0
YQ_VERSION = 4.40.4
OS_VERSION := $(shell . /etc/os-release; echo $$VERSION_ID)

Expand Down
6 changes: 3 additions & 3 deletions 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
KIND_VERSION = 0.23.0
KUBERNETES_VERSION = 1.30.0
CERT_MANAGER_VERSION = 1.13.2
MYSQL_VERSION = 8.0.35
MYSQL_VERSION = 8.0.37

KIND := $(dir $(shell pwd))/bin/kind
KUBECTL := $(dir $(shell pwd))/bin/kubectl
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cybozu-go/moco

go 1.21
go 1.22.3

require (
cloud.google.com/go/storage v1.35.1
Expand Down
2 changes: 1 addition & 1 deletion kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ resources:

images:
- name: ghcr.io/cybozu-go/moco
newTag: 0.20.2
newTag: 0.20.3
4 changes: 2 additions & 2 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const (
Version = "0.20.2"

// FluentBitImage is the image for slow-log sidecar container.
FluentBitImage = "ghcr.io/cybozu-go/moco/fluent-bit:2.2.0.1"
FluentBitImage = "ghcr.io/cybozu-go/moco/fluent-bit:3.0.2.1"

// ExporterImage is the image for mysqld_exporter sidecar container.
ExporterImage = "ghcr.io/cybozu-go/moco/mysqld_exporter:0.15.0.2"
ExporterImage = "ghcr.io/cybozu-go/moco/mysqld_exporter:0.15.1.1"
)

0 comments on commit 63444b6

Please sign in to comment.