Update dependencies

Signed-off-by: terashima <[email protected]>
cybozu-go · Dec 26, 2024 · 2907b7e · 2907b7e
1 parent 39b2f23
commit 2907b7e
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 107 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,12 +8,12 @@ defaults:
   run:
     working-directory: v2
 env:
-  go-version: "1.22"
+  go-version: "1.23"
   cache-version: 1
 jobs:
   test:
     name: Small test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
@@ -41,7 +41,7 @@ jobs:
       matrix:
         kindest-node: ["1.28.15", "1.29.12", "1.30.8"]
         ip-version: ["ipv4", "ipv6"]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,12 +7,12 @@ defaults:
   run:
     working-directory: v2
 env:
-  go-version: "1.22"
+  go-version: "1.23"
   cache-version: 1
 jobs:
   image:
     name: Push container image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -44,7 +44,7 @@ jobs:
         id: set-tag
         run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT # Remove "v" prefix.
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./v2
           platforms: linux/amd64,linux/arm64/v8
@@ -53,7 +53,7 @@ jobs:
   release:
     name: Release on GitHub
     needs: image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Create release

diff --git a/v2/Dockerfile b/v2/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.22-jammy as build-env
+FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.23-noble as build-env
 
 ARG TARGETARCH
 
@@ -7,7 +7,7 @@ WORKDIR /workdir
 
 RUN make build GOARCH=${TARGETARCH}
 
-FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu:22.04
+FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu:24.04
 
 # https://docs.github.com/en/packages/managing-container-images-with-github-container-registry/connecting-a-repository-to-a-container-image#connecting-a-repository-to-a-container-image-on-the-command-line
 LABEL org.opencontainers.image.source https://github.com/cybozu-go/coil

diff --git a/v2/Makefile b/v2/Makefile
@@ -2,12 +2,12 @@
 
 IMAGE_TAG := latest
 CONTROLLER_RUNTIME_VERSION := $(shell awk '/sigs\.k8s\.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
-CONTROLLER_TOOLS_VERSION=0.15.0
-PROTOC_VERSION=27.2
+CONTROLLER_TOOLS_VERSION=0.16.4
+PROTOC_VERSION=29.2
 PROTOC_GEN_GO_VERSION := $(shell awk '/google.golang.org\/protobuf/ {print substr($$2, 2)}' go.mod)
-PROTOC_GEN_GO_GRPC_VERSON=1.4.0
+PROTOC_GEN_GO_GRPC_VERSON=1.5.1
 PROTOC_GEN_DOC_VERSION=1.5.1
-YQ_VERSION=4.44.1
+YQ_VERSION=4.44.6
 
 ## DON'T EDIT BELOW THIS LINE
 SUDO=sudo

diff --git a/v2/config/crd/bases/coil.cybozu.com_addressblocks.yaml b/v2/config/crd/bases/coil.cybozu.com_addressblocks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: addressblocks.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -33,7 +33,6 @@ spec:
         description: |-
           AddressBlock is the Schema for the addressblocks API
 
-
           The ownerReferences field contains the AddressPool where the block is carved from.
         properties:
           apiVersion:

diff --git a/v2/config/crd/bases/coil.cybozu.com_addresspools.yaml b/v2/config/crd/bases/coil.cybozu.com_addresspools.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: addresspools.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -58,7 +58,6 @@ spec:
                   For example, if the first item is an IPv4 subnet, the other items must also be
                   an IPv4 subnet.
 
-
                   This field can be updated only by adding subnets to the list.
                 items:
                   description: |-

diff --git a/v2/config/crd/bases/coil.cybozu.com_blockrequests.yaml b/v2/config/crd/bases/coil.cybozu.com_blockrequests.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: blockrequests.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -20,7 +20,6 @@ spec:
         description: |-
           BlockRequest is the Schema for the blockrequests API
 
-
           The ownerReferences field contains the Node on which coild that created this run.
         properties:
           apiVersion:

diff --git a/v2/config/crd/bases/coil.cybozu.com_egresses.yaml b/v2/config/crd/bases/coil.cybozu.com_egresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: egresses.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -112,9 +112,6 @@ spec:
                       description: |-
                         Rolling update config params. Present only if DeploymentStrategyType =
                         RollingUpdate.
-                        ---
-                        TODO: Update this to follow our convention for oneOf, whatever we decide it
-                        to be.
                       properties:
                         maxSurge:
                           anyOf:
@@ -867,6 +864,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -973,6 +971,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -1171,6 +1170,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -1572,6 +1572,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -1678,6 +1679,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -1876,6 +1878,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -2291,6 +2294,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -2397,6 +2401,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port
@@ -2595,6 +2600,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                       - port

diff --git a/v2/config/rbac/coild_role.yaml b/v2/config/rbac/coild_role.yaml
@@ -8,6 +8,7 @@ rules:
   - ""
   resources:
   - namespaces
+  - pods
   - services
   verbs:
   - get
@@ -19,14 +20,6 @@ rules:
   - nodes
   verbs:
   - get
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - coil.cybozu.com
   resources:

diff --git a/v2/go.mod b/v2/go.mod
@@ -1,32 +1,32 @@
 module github.com/cybozu-go/coil/v2
 
-go 1.22.5
+go 1.23.4
 
 require (
 	github.com/bits-and-blooms/bitset v1.13.0
-	github.com/containernetworking/cni v1.2.2
-	github.com/containernetworking/plugins v1.5.1
-	github.com/coreos/go-iptables v0.7.0
-	github.com/cybozu-go/netutil v1.4.8
+	github.com/containernetworking/cni v1.2.3
+	github.com/containernetworking/plugins v1.6.1
+	github.com/coreos/go-iptables v0.8.0
+	github.com/cybozu-go/netutil v1.4.9
 	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/nftables v0.2.0
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/onsi/ginkgo/v2 v2.19.0
-	github.com/onsi/gomega v1.33.1
-	github.com/prometheus/client_golang v1.20.3
+	github.com/onsi/ginkgo/v2 v2.22.1
+	github.com/onsi/gomega v1.36.2
+	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.59.1
+	github.com/prometheus/common v0.61.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	github.com/vishvananda/netlink v1.2.1-beta.2.0.20230807190133-6afddb37c1f0
+	github.com/vishvananda/netlink v1.3.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/sync v0.8.0
-	golang.org/x/sys v0.25.0
-	google.golang.org/grpc v1.65.0
-	google.golang.org/protobuf v1.34.2
+	golang.org/x/sync v0.10.0
+	golang.org/x/sys v0.28.0
+	google.golang.org/grpc v1.69.2
+	google.golang.org/protobuf v1.36.1
 	k8s.io/api v0.30.8
 	k8s.io/apimachinery v0.30.8
 	k8s.io/client-go v0.30.8
@@ -51,7 +51,7 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
+	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -64,40 +64,41 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
-	github.com/mdlayher/socket v0.5.0 // indirect
+	github.com/mdlayher/socket v0.5.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // 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/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/safchain/ethtool v0.4.0 // indirect
+	github.com/safchain/ethtool v0.5.9 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/vishvananda/netns v0.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.25.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.30.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/knftables v0.0.18 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )