Skip to content

Commit 6202c32

Browse files
kaworurolinh
authored andcommitted
cmd: bump Cilium to v1.18.4
Signed-off-by: Alexandre Perrin <[email protected]>
1 parent c06af3e commit 6202c32

File tree

2 files changed

+133
-132
lines changed

2 files changed

+133
-132
lines changed

cmd/go.mod

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.24.0
66
toolchain go1.24.6
77

88
require (
9-
github.com/cilium/cilium v1.16.17
9+
github.com/cilium/cilium v1.18.4
1010
github.com/cilium/fake v0.7.0
1111
github.com/cilium/fake/flow v0.7.0
1212
github.com/spf13/cobra v1.10.1
@@ -17,69 +17,78 @@ require (
1717
require (
1818
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
1919
github.com/blang/semver/v4 v4.0.0 // indirect
20-
github.com/fatih/color v1.17.0 // indirect
21-
github.com/fsnotify/fsnotify v1.7.0 // indirect
22-
github.com/go-logr/logr v1.4.2 // indirect
20+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
21+
github.com/cilium/ebpf v0.19.0 // indirect
22+
github.com/cilium/hive v0.0.0-20250611195437-5a5dacdfb354 // indirect
23+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
24+
github.com/fatih/color v1.18.0 // indirect
25+
github.com/fsnotify/fsnotify v1.9.0 // indirect
26+
github.com/go-logr/logr v1.4.3 // indirect
2327
github.com/go-openapi/analysis v0.23.0 // indirect
24-
github.com/go-openapi/errors v0.22.0 // indirect
28+
github.com/go-openapi/errors v0.22.1 // indirect
2529
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2630
github.com/go-openapi/jsonreference v0.21.0 // indirect
2731
github.com/go-openapi/loads v0.22.0 // indirect
2832
github.com/go-openapi/spec v0.21.0 // indirect
2933
github.com/go-openapi/strfmt v0.23.0 // indirect
30-
github.com/go-openapi/swag v0.23.0 // indirect
34+
github.com/go-openapi/swag v0.23.1 // indirect
3135
github.com/go-openapi/validate v0.24.0 // indirect
36+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3237
github.com/google/go-cmp v0.7.0 // indirect
3338
github.com/google/uuid v1.6.0 // indirect
34-
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
3539
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3640
github.com/josharian/intern v1.0.0 // indirect
37-
github.com/mackerelio/go-osstat v0.2.5 // indirect
38-
github.com/magiconair/properties v1.8.7 // indirect
39-
github.com/mailru/easyjson v0.7.7 // indirect
41+
github.com/mackerelio/go-osstat v0.2.6 // indirect
42+
github.com/mailru/easyjson v0.9.0 // indirect
4043
github.com/mattn/go-colorable v0.1.13 // indirect
4144
github.com/mattn/go-isatty v0.0.20 // indirect
4245
github.com/mitchellh/mapstructure v1.5.0 // indirect
4346
github.com/oklog/ulid v1.3.1 // indirect
44-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
47+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
4548
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
46-
github.com/sagikazarmark/locafero v0.4.0 // indirect
47-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
49+
github.com/sagikazarmark/locafero v0.7.0 // indirect
4850
github.com/sasha-s/go-deadlock v0.3.5 // indirect
49-
github.com/sirupsen/logrus v1.9.3 // indirect
5051
github.com/sourcegraph/conc v0.3.0 // indirect
51-
github.com/spf13/afero v1.11.0 // indirect
52-
github.com/spf13/cast v1.6.0 // indirect
53-
github.com/spf13/viper v1.19.0 // indirect
52+
github.com/spf13/afero v1.14.0 // indirect
53+
github.com/spf13/cast v1.9.2 // indirect
54+
github.com/spf13/viper v1.20.1 // indirect
5455
github.com/subosito/gotenv v1.6.0 // indirect
55-
github.com/vishvananda/netlink v1.3.1-0.20241022031324-976bd8de7d81 // indirect
56-
github.com/vishvananda/netns v0.0.4 // indirect
56+
github.com/vishvananda/netlink v1.3.1 // indirect
57+
github.com/vishvananda/netns v0.0.5 // indirect
5758
go.mongodb.org/mongo-driver v1.14.0 // indirect
59+
go.uber.org/dig v1.17.1 // indirect
5860
go.uber.org/multierr v1.11.0 // indirect
61+
go.yaml.in/yaml/v3 v3.0.4 // indirect
5962
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
60-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
6163
golang.org/x/net v0.47.0 // indirect
6264
golang.org/x/sync v0.18.0 // indirect
6365
golang.org/x/sys v0.38.0 // indirect
66+
golang.org/x/term v0.37.0 // indirect
6467
golang.org/x/text v0.31.0 // indirect
6568
golang.org/x/time v0.12.0 // indirect
66-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
67-
google.golang.org/grpc v1.72.1 // indirect
68-
gopkg.in/ini.v1 v1.67.0 // indirect
69+
golang.org/x/tools v0.38.0 // indirect
70+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
71+
google.golang.org/grpc v1.74.2 // indirect
6972
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/apimachinery v0.30.2 // indirect
71-
k8s.io/client-go v0.30.2 // indirect
73+
k8s.io/apimachinery v0.33.3 // indirect
74+
k8s.io/client-go v0.33.3 // indirect
7275
k8s.io/klog/v2 v2.130.1 // indirect
73-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
76+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
7477
)
7578

7679
// Replace directives from github.com/cilium/cilium. Keep in sync when updating Cilium!
77-
replace (
78-
go.universe.tf/metallb => github.com/cilium/metallb v0.9.6
79-
// Using private fork of controller-tools. See commit msg for more context
80-
// as to why we are using a private fork.
81-
sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.12.1
82-
)
80+
81+
// Using private fork of controller-tools. See commit msg for more context
82+
// as to why we are using a private fork.
83+
replace sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.16.5-1
84+
85+
// Using private fork of gobgp. See commit msg for more context as to why we
86+
// are using a private fork.
87+
replace github.com/osrg/gobgp/v3 => github.com/cilium/gobgp/v3 v3.0.0-20250717193620-26a4abb75464
88+
89+
// Using private fork of k8s.io/apimachinery with additional patches to support
90+
// `omitzero` json tags in convertors used by cilium.
91+
replace k8s.io/apimachinery => github.com/cilium/apimachinery v0.33.3-1
8392

8493
replace github.com/cilium/fake => ../
8594

0 commit comments

Comments
 (0)