Skip to content

Commit e20b2ad

Browse files
chez-shanpuchez-shanpu
committed
Update for k8s 1.31
Signed-off-by: Tomoki Sugiura <tomoki-sugiura@cybozu.co.jp>
1 parent c553221 commit e20b2ad

File tree

6 files changed

+146
-148
lines changed

6 files changed

+146
-148
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
name: End-to-end Test
4444
strategy:
4545
matrix:
46-
kindest-node: ["1.28.15", "1.29.12", "1.30.8"]
46+
kindest-node: ["1.29.12", "1.30.8", "1.31.4"]
4747
with-ipam: ["false", "true"]
4848
ipv6: ["false", "true"]
4949
runs-on: ubuntu-24.04

‎v2/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
IMAGE_TAG := latest
44
CONTROLLER_RUNTIME_VERSION := $(shell awk '/sigs\.k8s\.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
5-
CONTROLLER_TOOLS_VERSION=0.16.4
6-
PROTOC_VERSION=29.2
5+
CONTROLLER_TOOLS_VERSION=0.16.5
6+
PROTOC_VERSION=29.3
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
10-
YQ_VERSION=4.44.6
10+
YQ_VERSION=4.45.1
1111

1212
## DON'T EDIT BELOW THIS LINE
1313
SUDO=sudo

‎v2/controllers/blockrequest_watcher_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import (
99
. "github.com/onsi/gomega"
1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12+
"k8s.io/utils/ptr"
1213
ctrl "sigs.k8s.io/controller-runtime"
14+
"sigs.k8s.io/controller-runtime/pkg/config"
1315
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
1416
)
1517

@@ -27,6 +29,9 @@ var _ = Describe("BlockRequest watcher", func() {
2729
Metrics: metricsserver.Options{
2830
BindAddress: "0",
2931
},
32+
Controller: config.Controller{
33+
SkipNameValidation: ptr.To(true),
34+
},
3035
})
3136
Expect(err).ToNot(HaveOccurred())
3237

‎v2/e2e/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
KIND_VERSION=0.26.0
2-
KUBERNETES_VERSION=1.30.8
3-
KUSTOMIZE_VERSION = 5.5.0
2+
KUBERNETES_VERSION=1.31.5
3+
KUSTOMIZE_VERSION = 5.6.0
44
BINDIR := $(abspath $(PWD)/../bin)
55

66
KIND := $(BINDIR)/kind

‎v2/go.mod‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,102 +3,101 @@ module github.com/cybozu-go/coil/v2
33
go 1.23.4
44

55
require (
6-
github.com/bits-and-blooms/bitset v1.13.0
6+
github.com/bits-and-blooms/bitset v1.20.0
77
github.com/containernetworking/cni v1.2.3
8-
github.com/containernetworking/plugins v1.6.1
8+
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
1313
github.com/google/go-cmp v0.6.0
14-
github.com/google/nftables v0.2.0
14+
github.com/google/nftables v0.3.0
1515
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
1616
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1717
github.com/onsi/ginkgo/v2 v2.22.1
1818
github.com/onsi/gomega v1.36.2
1919
github.com/prometheus/client_golang v1.20.5
2020
github.com/prometheus/client_model v0.6.1
21-
github.com/prometheus/common v0.61.0
21+
github.com/prometheus/common v0.62.0
2222
github.com/spf13/cobra v1.8.1
2323
github.com/spf13/viper v1.19.0
2424
github.com/vishvananda/netlink v1.3.0
2525
go.uber.org/zap v1.27.0
26-
golang.org/x/sync v0.10.0
27-
golang.org/x/sys v0.28.0
28-
google.golang.org/grpc v1.69.2
29-
google.golang.org/protobuf v1.36.1
30-
k8s.io/api v0.30.8
31-
k8s.io/apimachinery v0.30.8
32-
k8s.io/client-go v0.30.8
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
3333
k8s.io/klog/v2 v2.130.1
3434
k8s.io/utils v0.0.0-20241210054802-24370beab758
35-
sigs.k8s.io/controller-runtime v0.18.6
35+
sigs.k8s.io/controller-runtime v0.19.5
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
4242
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
43-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
44-
github.com/fsnotify/fsnotify v1.7.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
44+
github.com/fsnotify/fsnotify v1.8.0 // indirect
45+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4546
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4647
github.com/go-openapi/jsonreference v0.21.0 // indirect
4748
github.com/go-openapi/swag v0.23.0 // indirect
4849
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4950
github.com/gogo/protobuf v1.3.2 // indirect
50-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
51+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
5152
github.com/golang/protobuf v1.5.4 // indirect
52-
github.com/google/gnostic-models v0.6.8 // indirect
53+
github.com/google/gnostic-models v0.6.9 // indirect
5354
github.com/google/gofuzz v1.2.0 // indirect
5455
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5556
github.com/google/uuid v1.6.0 // indirect
5657
github.com/hashicorp/hcl v1.0.0 // indirect
5758
github.com/imdario/mergo v0.3.16 // indirect
5859
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5960
github.com/josharian/intern v1.0.0 // indirect
60-
github.com/josharian/native v1.1.0 // indirect
6161
github.com/json-iterator/go v1.1.12 // indirect
62-
github.com/klauspost/compress v1.17.9 // indirect
62+
github.com/klauspost/compress v1.17.11 // indirect
6363
github.com/kylelemons/godebug v1.1.0 // indirect
64-
github.com/magiconair/properties v1.8.7 // indirect
65-
github.com/mailru/easyjson v0.7.7 // indirect
66-
github.com/mdlayher/netlink v1.7.2 // indirect
64+
github.com/magiconair/properties v1.8.9 // indirect
65+
github.com/mailru/easyjson v0.9.0 // indirect
66+
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
6767
github.com/mdlayher/socket v0.5.1 // indirect
6868
github.com/mitchellh/mapstructure v1.5.0 // indirect
6969
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7070
github.com/modern-go/reflect2 v1.0.2 // indirect
7171
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
72-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
73-
github.com/pkg/errors v0.9.1 // indirect
72+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
7473
github.com/prometheus/procfs v0.15.1 // indirect
75-
github.com/safchain/ethtool v0.5.9 // indirect
76-
github.com/sagikazarmark/locafero v0.4.0 // indirect
74+
github.com/safchain/ethtool v0.5.10 // indirect
75+
github.com/sagikazarmark/locafero v0.7.0 // indirect
7776
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7877
github.com/sourcegraph/conc v0.3.0 // indirect
79-
github.com/spf13/afero v1.11.0 // indirect
80-
github.com/spf13/cast v1.6.0 // indirect
81-
github.com/spf13/pflag v1.0.5 // indirect
78+
github.com/spf13/afero v1.12.0 // indirect
79+
github.com/spf13/cast v1.7.1 // indirect
80+
github.com/spf13/pflag v1.0.6 // indirect
8281
github.com/subosito/gotenv v1.6.0 // indirect
8382
github.com/vishvananda/netns v0.0.5 // indirect
83+
github.com/x448/float16 v0.8.4 // indirect
8484
go.uber.org/multierr v1.11.0 // indirect
85-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
86-
golang.org/x/net v0.33.0 // indirect
87-
golang.org/x/oauth2 v0.24.0 // indirect
88-
golang.org/x/term v0.27.0 // indirect
89-
golang.org/x/text v0.21.0 // indirect
90-
golang.org/x/time v0.6.0 // indirect
91-
golang.org/x/tools v0.28.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
9292
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
93-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
93+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
9494
gopkg.in/inf.v0 v0.9.1 // indirect
9595
gopkg.in/ini.v1 v1.67.0 // indirect
96-
gopkg.in/yaml.v2 v2.4.0 // indirect
9796
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/apiextensions-apiserver v0.30.4 // indirect
99-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
100-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // 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
101100
sigs.k8s.io/knftables v0.0.18 // indirect
102-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
101+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
103102
sigs.k8s.io/yaml v1.4.0 // indirect
104103
)

0 commit comments

Comments
 (0)