Skip to content

Commit 639292f

Browse files
authored
Merge pull request #321 from cybozu-go/bump-deps
Update go deps
2 parents 52b38c6 + cbdbca4 commit 639292f

File tree

8 files changed

+204
-224
lines changed

8 files changed

+204
-224
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defaults:
88
run:
99
working-directory: v2
1010
env:
11-
go-version: "1.23"
11+
go-version: "1.24"
1212
cache-version: 1
1313
jobs:
1414
test:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defaults:
77
run:
88
working-directory: v2
99
env:
10-
go-version: "1.23"
10+
go-version: "1.24"
1111
cache-version: 1
1212
jobs:
1313
image:

v2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.23-noble as build-env
1+
FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.24-noble as build-env
22

33
ARG TARGETARCH
44

v2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
IMAGE_TAG := latest
44
CONTROLLER_RUNTIME_VERSION := $(shell awk '/sigs\.k8s\.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
55
CONTROLLER_TOOLS_VERSION=0.16.5
6-
PROTOC_VERSION=29.3
6+
PROTOC_VERSION=30.2
77
PROTOC_GEN_GO_VERSION := $(shell awk '/google.golang.org\/protobuf/ {print substr($$2, 2)}' go.mod)
88
PROTOC_GEN_GO_GRPC_VERSON=1.5.1
99
PROTOC_GEN_DOC_VERSION=1.5.1

v2/go.mod

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,75 @@ module github.com/cybozu-go/coil/v2
33
go 1.23.4
44

55
require (
6-
github.com/bits-and-blooms/bitset v1.20.0
6+
github.com/bits-and-blooms/bitset v1.22.0
77
github.com/containernetworking/cni v1.2.3
88
github.com/containernetworking/plugins v1.6.2
99
github.com/coreos/go-iptables v0.8.0
1010
github.com/cybozu-go/netutil v1.4.9
1111
github.com/go-logr/logr v1.4.2
1212
github.com/go-logr/zapr v1.3.0
13-
github.com/google/go-cmp v0.6.0
13+
github.com/google/go-cmp v0.7.0
1414
github.com/google/nftables v0.3.0
15-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
15+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
1616
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
17-
github.com/onsi/ginkgo/v2 v2.22.1
18-
github.com/onsi/gomega v1.36.2
19-
github.com/prometheus/client_golang v1.20.5
17+
github.com/onsi/ginkgo/v2 v2.23.3
18+
github.com/onsi/gomega v1.36.3
19+
github.com/prometheus/client_golang v1.21.1
2020
github.com/prometheus/client_model v0.6.1
21-
github.com/prometheus/common v0.62.0
22-
github.com/spf13/cobra v1.8.1
23-
github.com/spf13/viper v1.19.0
21+
github.com/prometheus/common v0.63.0
22+
github.com/spf13/cobra v1.9.1
23+
github.com/spf13/viper v1.20.1
2424
github.com/vishvananda/netlink v1.3.0
2525
go.uber.org/zap v1.27.0
26-
golang.org/x/sync v0.11.0
27-
golang.org/x/sys v0.30.0
28-
google.golang.org/grpc v1.70.0
29-
google.golang.org/protobuf v1.36.5
30-
k8s.io/api v0.31.5
31-
k8s.io/apimachinery v0.31.5
32-
k8s.io/client-go v0.31.5
26+
golang.org/x/sync v0.12.0
27+
golang.org/x/sys v0.31.0
28+
google.golang.org/grpc v1.71.0
29+
google.golang.org/protobuf v1.36.6
30+
k8s.io/api v0.31.7
31+
k8s.io/apimachinery v0.31.7
32+
k8s.io/client-go v0.31.7
3333
k8s.io/klog/v2 v2.130.1
34-
k8s.io/utils v0.0.0-20241210054802-24370beab758
35-
sigs.k8s.io/controller-runtime v0.19.5
34+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
35+
sigs.k8s.io/controller-runtime v0.19.7
3636
)
3737

3838
require (
3939
github.com/beorn7/perks v1.0.1 // indirect
4040
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
42-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
43-
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
42+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4444
github.com/fsnotify/fsnotify v1.8.0 // indirect
4545
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
46-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
47-
github.com/go-openapi/jsonreference v0.21.0 // indirect
48-
github.com/go-openapi/swag v0.23.0 // indirect
46+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
47+
github.com/go-openapi/jsonreference v0.20.2 // indirect
48+
github.com/go-openapi/swag v0.22.4 // indirect
4949
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
50+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
5051
github.com/gogo/protobuf v1.3.2 // indirect
51-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
52+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5253
github.com/golang/protobuf v1.5.4 // indirect
53-
github.com/google/gnostic-models v0.6.9 // indirect
54+
github.com/google/gnostic-models v0.6.8 // indirect
5455
github.com/google/gofuzz v1.2.0 // indirect
5556
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5657
github.com/google/uuid v1.6.0 // indirect
57-
github.com/hashicorp/hcl v1.0.0 // indirect
58-
github.com/imdario/mergo v0.3.16 // indirect
58+
github.com/imdario/mergo v0.3.6 // indirect
5959
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6060
github.com/josharian/intern v1.0.0 // indirect
6161
github.com/json-iterator/go v1.1.12 // indirect
6262
github.com/klauspost/compress v1.17.11 // indirect
6363
github.com/kylelemons/godebug v1.1.0 // indirect
64-
github.com/magiconair/properties v1.8.9 // indirect
65-
github.com/mailru/easyjson v0.9.0 // indirect
64+
github.com/mailru/easyjson v0.7.7 // indirect
6665
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
6766
github.com/mdlayher/socket v0.5.1 // indirect
68-
github.com/mitchellh/mapstructure v1.5.0 // indirect
6967
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7068
github.com/modern-go/reflect2 v1.0.2 // indirect
7169
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7270
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
71+
github.com/pkg/errors v0.9.1 // indirect
7372
github.com/prometheus/procfs v0.15.1 // indirect
74-
github.com/safchain/ethtool v0.5.10 // indirect
73+
github.com/safchain/ethtool v0.5.9 // indirect
7574
github.com/sagikazarmark/locafero v0.7.0 // indirect
76-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7775
github.com/sourcegraph/conc v0.3.0 // indirect
7876
github.com/spf13/afero v1.12.0 // indirect
7977
github.com/spf13/cast v1.7.1 // indirect
@@ -82,22 +80,22 @@ require (
8280
github.com/vishvananda/netns v0.0.5 // indirect
8381
github.com/x448/float16 v0.8.4 // indirect
8482
go.uber.org/multierr v1.11.0 // indirect
85-
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
86-
golang.org/x/net v0.34.0 // indirect
87-
golang.org/x/oauth2 v0.26.0 // indirect
88-
golang.org/x/term v0.29.0 // indirect
89-
golang.org/x/text v0.22.0 // indirect
90-
golang.org/x/time v0.10.0 // indirect
91-
golang.org/x/tools v0.29.0 // indirect
83+
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
84+
golang.org/x/net v0.37.0 // indirect
85+
golang.org/x/oauth2 v0.25.0 // indirect
86+
golang.org/x/term v0.30.0 // indirect
87+
golang.org/x/text v0.23.0 // indirect
88+
golang.org/x/time v0.8.0 // indirect
89+
golang.org/x/tools v0.30.0 // indirect
9290
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
93-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
9492
gopkg.in/inf.v0 v0.9.1 // indirect
95-
gopkg.in/ini.v1 v1.67.0 // indirect
93+
gopkg.in/yaml.v2 v2.4.0 // indirect
9694
gopkg.in/yaml.v3 v3.0.1 // indirect
97-
k8s.io/apiextensions-apiserver v0.31.5 // indirect
98-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
99-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
95+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
96+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
97+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
10098
sigs.k8s.io/knftables v0.0.18 // indirect
101-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
99+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
102100
sigs.k8s.io/yaml v1.4.0 // indirect
103101
)

0 commit comments

Comments
 (0)