update for review comment

cybozu-go · May 22, 2024 · 42a33b3 · 42a33b3
1 parent a0c668e
commit 42a33b3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/build-fluent-bit-container.yaml b/.github/workflows/build-fluent-bit-container.yaml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-20.04' }}
+    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-22.04' }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3

diff --git a/.github/workflows/build-mysql-container.yaml b/.github/workflows/build-mysql-container.yaml
@@ -41,7 +41,7 @@ jobs:
   tests:
     if: ${{ (github.event_name == 'pull_request') && (needs.filter.outputs.mysql-versions != '[]') }}
     needs: filter
-    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-20.04' }}
+    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-22.04' }}
     strategy:
       matrix:
         mysql-version: ${{ fromJson(needs.filter.outputs.mysql-versions) }}
@@ -107,7 +107,7 @@ jobs:
   build:
     if: ${{ (github.ref == 'refs/heads/main') && (needs.filter.outputs.mysql-versions != '[]') }}
     needs: filter
-    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-20.04' }}
+    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-22.04' }}
     strategy:
       matrix:
         mysql-version: ${{ fromJson(needs.filter.outputs.mysql-versions) }}

diff --git a/.github/workflows/build-mysqld-exporter-container.yaml b/.github/workflows/build-mysqld-exporter-container.yaml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-20.04' }}
+    runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-22.04' }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,7 +45,7 @@ jobs:
         cache-to: type=gha,mode=max
   build-moco-backup:
     name: Push Container Image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Set up QEMU
@@ -84,7 +84,7 @@ jobs:
   release:
     name: Release on GitHub
     needs: [build-moco, build-moco-backup]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5

diff --git a/go.mod b/go.mod
@@ -3,38 +3,38 @@ module github.com/cybozu-go/moco
 go 1.22.3
 
 require (
-	cloud.google.com/go/storage v1.35.1
-	github.com/aws/aws-sdk-go-v2 v1.23.5
-	github.com/aws/aws-sdk-go-v2/config v1.25.11
-	github.com/aws/aws-sdk-go-v2/credentials v1.16.9
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.4
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.47.2
+	cloud.google.com/go/storage v1.41.0
+	github.com/aws/aws-sdk-go-v2 v1.27.0
+	github.com/aws/aws-sdk-go-v2/config v1.27.15
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.15
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.2
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.54.2
 	github.com/cybozu-go/moco-agent v0.10.0
-	github.com/go-logr/logr v1.3.0
+	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/stdr v1.2.2
-	github.com/go-sql-driver/mysql v1.7.1
+	github.com/go-sql-driver/mysql v1.8.1
 	github.com/google/go-cmp v0.6.0
-	github.com/jmoiron/sqlx v1.3.5
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.30.0
-	github.com/prometheus/client_golang v1.17.0
-	github.com/prometheus/client_model v0.5.0
-	github.com/prometheus/common v0.45.0
+	github.com/jmoiron/sqlx v1.4.0
+	github.com/onsi/ginkgo v1.18.0
+	github.com/onsi/gomega v1.33.1
+	github.com/prometheus/client_golang v1.19.1
+	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/common v0.53.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	go.uber.org/zap v1.26.0
-	google.golang.org/api v0.152.0
-	google.golang.org/grpc v1.59.0
-	google.golang.org/protobuf v1.33.0
-	k8s.io/api v0.27.8
-	k8s.io/apimachinery v0.27.8
-	k8s.io/cli-runtime v0.27.8
-	k8s.io/client-go v0.27.8
-	k8s.io/klog/v2 v2.110.1
-	k8s.io/kubectl v0.27.8
-	k8s.io/utils v0.0.0-20231127182322-b307cd553661
-	sigs.k8s.io/controller-runtime v0.15.3
+	go.uber.org/zap v1.27.0
+	google.golang.org/api v0.181.0
+	google.golang.org/grpc v1.64.0
+	google.golang.org/protobuf v1.34.1
+	k8s.io/api v0.30.1
+	k8s.io/apimachinery v0.30.1
+	k8s.io/cli-runtime v0.30.1
+	k8s.io/client-go v0.30.1
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/kubectl v0.30.1
+	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
+	sigs.k8s.io/controller-runtime v0.18.2
 )
 
 require (

diff --git a/kustomization.yaml b/kustomization.yaml
@@ -3,4 +3,4 @@ resources:
 
 images:
 - name: ghcr.io/cybozu-go/moco
-  newTag: 0.20.3
+  newTag: 0.20.2