Merge pull request #50 from cybozu-go/regular-update-1.31

Update for k8s 1.31

.github/workflows/ci.yaml

@@ -39,9 +39,9 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      - uses: goreleaser/goreleaser-action@v6.0.0
+      - uses: goreleaser/goreleaser-action@v6.1.0
         with:
-          version: v2.2.0
+          version: v2.6.1
           args: check -f .goreleaser.yml
   test:
     name: Test
@@ -58,7 +58,7 @@ jobs:
     name: End-to-End Tests
     strategy:
       matrix:
-        k8s-version: ["1.29.8", "1.30.4", "1.31.0"]
+        k8s-version: ["1.30.8", "1.31.4", "1.32.0"]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -95,9 +95,9 @@ jobs:
         run: |
           echo "GORELEASER_CURRENT_TAG=$(git describe --tags --abbrev=0 --match "v*" || echo v0.0.0)" >> $GITHUB_ENV
       - name: GoReleaser
-        uses: goreleaser/goreleaser-action@v6.0.0
+        uses: goreleaser/goreleaser-action@v6.1.0
         with:
-          version: v2.2.0
+          version: v2.6.1
           args: --snapshot --skip publish --clean
       - name: Test built containers
         run: make container-structure-test

.github/workflows/helm-release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v4
         with:
-          version: v3.15.4
+          version: v3.17.0
       - name: Check chart version
         run: |
           tag_version=${GITHUB_REF##*/chart-v}
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v4
         with:
-          version: v3.15.4
+          version: v3.17.0
       - uses: actions/download-artifact@v4
         with:
           name: helm-charts

.github/workflows/helm.yml

@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # 2.6.1
+        uses: helm/chart-testing-action@cf48dbf901ed202ae2c5aee26422dd6dfdf41e47 # 2.7.0
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
@@ -25,11 +25,11 @@ jobs:
       - name: Run chart-testing (lint)
         run: ct lint --config ct.yaml
       - name: Create kind cluster
-        uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # 1.10.0
+        uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # 1.12.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           node_image: kindest/node:v1.27.3
-          version: v0.24.0
+          version: v0.26.0
       - name: Apply cert-manager
         run: |
           kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml

.github/workflows/release.yml

@@ -24,9 +24,9 @@ jobs:
         with:
           go-version-file: go.mod
       - name: GoReleaser
-        uses: goreleaser/goreleaser-action@v6.0.0
+        uses: goreleaser/goreleaser-action@v6.1.0
         with:
-          version: v2.2.0
+          version: v2.6.1
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.52.2
+    rev: v1.63.4
     hooks:
       - id: golangci-lint
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v5.0.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml

Makefile.versions

@@ -4,23 +4,23 @@ ACTIONS_SETUP_GO_VERSION := 5
 ACTIONS_SETUP_PYTHON_VERSION := 5
 ACTIONS_UPLOAD_ARTIFACT_VERSION := 4
 AZURE_SETUP_HELM_VERSION := 4
-CILIUM_VERSION := 1.14.14
-CERT_MANAGER_VERSION := 1.14.4
-CST_VERSION := 1.19.1
+CILIUM_VERSION := 1.15.13
+CERT_MANAGER_VERSION := 1.16.1
+CST_VERSION := 1.19.3
 CTRL_TOOLS_VERSION := 0.14.0
 DOCKER_LOGIN_VERSION := 3
 DOCKER_SETUP_BUILDX_VERSION := 3
 DOCKER_SETUP_QEMU_VERSION := 3
 GH_VERSION := 2.34.0
-GORELEASER_VERSION := 2.2.0
-GORELEASER_ACTION_VERSION := 6.0.0
-HELM_CHART_TESTING_VESRION := 2.6.1
-HELM_CHART_TESTING_HASH := e6669bcd63d7cb57cb4380c33043eebe5d111992
-HELM_KIND_VERSION := 1.10.0
-HELM_KIND_HASH := 0025e74a8c7512023d06dc019c617aa3cf561fde
-HELM_VERSION := 3.15.4
-KIND_VERSION := 0.24.0
-KUBERNETES_VERSION := 1.31.0
-KUSTOMIZE_VERSION := 5.2.1
-MDBOOK_VERSION := 0.4.40
+GORELEASER_VERSION := 2.6.1
+GORELEASER_ACTION_VERSION := 6.1.0
+HELM_CHART_TESTING_VESRION := 2.7.0
+HELM_CHART_TESTING_HASH := cf48dbf901ed202ae2c5aee26422dd6dfdf41e47
+HELM_KIND_VERSION := 1.12.0
+HELM_KIND_HASH := a1b0e391336a6ee6713a0583f8c6240d70863de3
+HELM_VERSION := 3.17.0
+KIND_VERSION := 0.26.0
+KUBERNETES_VERSION := 1.31.5
+KUSTOMIZE_VERSION := 5.4.3
+MDBOOK_VERSION := 0.4.44
 YQ_VERSION := 4.35.1

go.mod

@@ -1,24 +1,27 @@
 module github.com/cybozu-go/tenet
 
-go 1.22.6
+go 1.23
+
+toolchain go1.23.4
 
 require (
 	github.com/go-logr/logr v1.4.2
 	github.com/google/uuid v1.6.0
-	github.com/onsi/ginkgo/v2 v2.20.2
-	github.com/onsi/gomega v1.34.2
-	k8s.io/api v0.31.0
-	k8s.io/apimachinery v0.31.0
-	k8s.io/client-go v0.31.0
-	sigs.k8s.io/controller-runtime v0.19.0
+	github.com/onsi/ginkgo/v2 v2.22.2
+	github.com/onsi/gomega v1.36.2
+	k8s.io/api v0.31.5
+	k8s.io/apimachinery v0.31.5
+	k8s.io/client-go v0.31.5
+	k8s.io/utils v0.0.0-20241210054802-24370beab758
+	sigs.k8s.io/controller-runtime v0.19.5
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
@@ -27,47 +30,44 @@ require (
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20240903155634-a8630aee4ab9 // indirect
+	github.com/google/pprof v0.0.0-20250202011525-fc3143867406 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.20.3 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.59.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.29.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.31.0 // indirect
+	k8s.io/apiextensions-apiserver v0.31.5 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
-	k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )