Skip to content

Commit fcd0bcc

Browse files
committed
Merge cilium 1.18.2: resolve go.mod and regenerate go.sum via go mod tidy
2 parents a80cf02 + 8aa836a commit fcd0bcc

File tree

2 files changed

+106
-130
lines changed

2 files changed

+106
-130
lines changed

go.mod

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.24.1
66

77
require (
88
github.com/appscode/go v0.0.0-20201105063637-5613f3b8169f
9-
github.com/cilium/cilium v1.17.6
9+
github.com/cilium/cilium v1.18.2
1010
github.com/getsentry/sentry-go v0.35.1
1111
github.com/golang/mock v1.6.0
1212
github.com/google/uuid v1.6.0
@@ -26,7 +26,10 @@ require (
2626
)
2727

2828
require (
29-
github.com/onsi/gomega v1.35.1 // indirect
29+
github.com/cloudflare/cfssl v1.6.5 // indirect
30+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
31+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
32+
github.com/onsi/gomega v1.36.1 // indirect
3033
go.yaml.in/yaml/v2 v2.4.2 // indirect
3134
go.yaml.in/yaml/v3 v3.0.4 // indirect
3235
sigs.k8s.io/randfill v1.0.0 // indirect
@@ -35,7 +38,7 @@ require (
3538

3639
require (
3740
cel.dev/expr v0.24.0 // indirect
38-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
41+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3942
github.com/Masterminds/goutils v1.1.1 // indirect
4043
github.com/Masterminds/semver/v3 v3.2.1 // indirect
4144
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
@@ -46,11 +49,11 @@ require (
4649
github.com/blang/semver/v4 v4.0.0 // indirect
4750
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4851
github.com/cespare/xxhash/v2 v2.3.0 // indirect
49-
github.com/cilium/ebpf v0.17.1 // indirect
50-
github.com/cilium/hive v0.0.0-20250522145610-0734675df148 // indirect
51-
github.com/cilium/proxy v0.0.0-20250526114940-b80199397e8a // indirect
52-
github.com/cilium/statedb v0.4.0 // indirect
53-
github.com/cilium/stream v0.0.0-20241203114243-53c3e5d79744 // indirect
52+
github.com/cilium/ebpf v0.19.0 // indirect
53+
github.com/cilium/hive v0.0.0-20250611195437-5a5dacdfb354 // indirect
54+
github.com/cilium/proxy v0.0.0-20250623105955-2136f59a4ea1 // indirect
55+
github.com/cilium/statedb v0.4.5 // indirect
56+
github.com/cilium/stream v0.0.1 // indirect
5457
github.com/coreos/go-semver v0.3.1 // indirect
5558
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5659
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -59,17 +62,17 @@ require (
5962
github.com/felixge/httpsnoop v1.0.4 // indirect
6063
github.com/fsnotify/fsnotify v1.9.0 // indirect
6164
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
62-
github.com/go-logr/logr v1.4.2 // indirect
65+
github.com/go-logr/logr v1.4.3 // indirect
6366
github.com/go-logr/stdr v1.2.2 // indirect
6467
github.com/go-openapi/analysis v0.23.0 // indirect
65-
github.com/go-openapi/errors v0.22.0 // indirect
68+
github.com/go-openapi/errors v0.22.1 // indirect
6669
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6770
github.com/go-openapi/jsonreference v0.21.0 // indirect
6871
github.com/go-openapi/loads v0.22.0 // indirect
6972
github.com/go-openapi/runtime v0.28.0 // indirect
7073
github.com/go-openapi/spec v0.21.0 // indirect
7174
github.com/go-openapi/strfmt v0.23.0 // indirect
72-
github.com/go-openapi/swag v0.23.0 // indirect
75+
github.com/go-openapi/swag v0.23.1 // indirect
7376
github.com/go-openapi/validate v0.24.0 // indirect
7477
github.com/go-resty/resty/v2 v2.16.5 // indirect
7578
github.com/gogo/protobuf v1.3.2 // indirect
@@ -80,24 +83,21 @@ require (
8083
github.com/google/gnostic-models v0.7.0 // indirect
8184
github.com/google/go-cmp v0.7.0 // indirect
8285
github.com/google/go-querystring v1.1.0 // indirect
83-
github.com/gopacket/gopacket v1.3.1 // indirect
8486
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8587
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
86-
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
8788
github.com/huandu/xstrings v1.3.3 // indirect
8889
github.com/imdario/mergo v0.3.16 // indirect
8990
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9091
github.com/josharian/intern v1.0.0 // indirect
9192
github.com/json-iterator/go v1.1.12 // indirect
9293
github.com/kylelemons/godebug v1.1.0 // indirect
93-
github.com/mackerelio/go-osstat v0.2.5 // indirect
94-
github.com/magiconair/properties v1.8.9 // indirect
94+
github.com/mackerelio/go-osstat v0.2.6 // indirect
9595
github.com/mailru/easyjson v0.9.0 // indirect
96-
github.com/mitchellh/copystructure v1.2.0 // indirect
96+
github.com/mitchellh/copystructure v1.1.2 // indirect
9797
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9898
github.com/mitchellh/mapstructure v1.5.0 // indirect
9999
github.com/mitchellh/reflectwalk v1.0.2 // indirect
100-
github.com/moby/term v0.5.0 // indirect
100+
github.com/moby/term v0.5.2 // indirect
101101
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
102102
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
103103
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -110,17 +110,15 @@ require (
110110
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
111111
github.com/prometheus/client_model v0.6.2 // indirect
112112
github.com/prometheus/common v0.65.0 // indirect
113-
github.com/prometheus/procfs v0.16.1 // indirect
114-
github.com/sagikazarmark/locafero v0.6.0 // indirect
115-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
113+
github.com/prometheus/procfs v0.17.0 // indirect
114+
github.com/sagikazarmark/locafero v0.7.0 // indirect
116115
github.com/sasha-s/go-deadlock v0.3.5 // indirect
117116
github.com/shopspring/decimal v1.2.0 // indirect
118-
github.com/sirupsen/logrus v1.9.3 // indirect
119117
github.com/sourcegraph/conc v0.3.0 // indirect
120-
github.com/spf13/afero v1.11.0 // indirect
121-
github.com/spf13/cast v1.7.1 // indirect
118+
github.com/spf13/afero v1.14.0 // indirect
119+
github.com/spf13/cast v1.9.2 // indirect
122120
github.com/spf13/cobra v1.9.1 // indirect
123-
github.com/spf13/viper v1.19.0 // indirect
121+
github.com/spf13/viper v1.20.1 // indirect
124122
github.com/stoewer/go-strcase v1.3.0 // indirect
125123
github.com/subosito/gotenv v1.6.0 // indirect
126124
github.com/vishvananda/netlink v1.3.1 // indirect
@@ -133,13 +131,13 @@ require (
133131
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
134132
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
135133
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
136-
go.opentelemetry.io/otel v1.35.0 // indirect
134+
go.opentelemetry.io/otel v1.37.0 // indirect
137135
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
138136
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
139-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
140-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
141-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
142-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
137+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
138+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
139+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
140+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
143141
go.uber.org/dig v1.18.0 // indirect
144142
go.uber.org/multierr v1.11.0 // indirect
145143
go.uber.org/zap v1.27.0 // indirect
@@ -152,18 +150,18 @@ require (
152150
golang.org/x/sys v0.35.0 // indirect
153151
golang.org/x/term v0.34.0 // indirect
154152
golang.org/x/text v0.28.0 // indirect
155-
golang.org/x/time v0.9.0 // indirect
153+
golang.org/x/time v0.12.0 // indirect
156154
golang.org/x/tools v0.36.0 // indirect
157-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
158-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
159-
google.golang.org/grpc v1.72.1 // indirect
155+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
156+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
157+
google.golang.org/grpc v1.74.2 // indirect
160158
google.golang.org/protobuf v1.36.6 // indirect
161159
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
162160
gopkg.in/inf.v0 v0.9.1 // indirect
163161
gopkg.in/ini.v1 v1.67.0 // indirect
164162
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
165163
gopkg.in/yaml.v3 v3.0.1 // indirect
166-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
164+
k8s.io/apiextensions-apiserver v0.33.3 // indirect
167165
k8s.io/apiserver v0.34.1 // indirect
168166
k8s.io/component-helpers v0.34.1
169167
k8s.io/controller-manager v0.34.1 // indirect
@@ -172,10 +170,8 @@ require (
172170
k8s.io/kubelet v0.33.0 // indirect
173171
k8s.io/kubernetes v1.33.4
174172
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0 // indirect
175-
sigs.k8s.io/gateway-api v1.3.0 // indirect
176173
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
177-
sigs.k8s.io/mcs-api v0.1.1-0.20250116162235-62ede9a032dc // indirect
178-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
174+
sigs.k8s.io/mcs-api v0.1.1-0.20250610011024-38bab5ba476b // indirect
179175
sigs.k8s.io/yaml v1.6.0 // indirect
180176
)
181177

0 commit comments

Comments
 (0)