Skip to content

Commit a2675df

Browse files
committed
go.mod, vendor: update cilium to latest master to pull in versioncheck fix
cilium-cli uses the github.com/cilium/cilium/pkg/versioncheck package to parse Cilium versions. In the latest version, this package was fixed to allow parsing snapshot release versions, cf. cilium/cilium#24286 For #1448 Signed-off-by: Tobias Klauser <tobias@cilium.io>
1 parent 6a22b8c commit a2675df

File tree

718 files changed

+45421
-23140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

718 files changed

+45421
-23140
lines changed

go.mod

+56-59
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ go 1.20
55
// Replace directives from github.com/cilium/cilium. Keep in sync when updating Cilium!
66
replace (
77
github.com/miekg/dns => github.com/cilium/dns v1.1.51-0.20220729113855-5b94b11b46fc
8-
github.com/optiopay/kafka => github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b
98
go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220829170633-5d7dfb1129f7
109
sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.6.2
1110
)
1211

1312
require (
1413
github.com/blang/semver/v4 v4.0.0
1514
github.com/cilium/charts v0.0.0-20230301052722-03729a11ad7e
16-
github.com/cilium/cilium v1.13.0
15+
github.com/cilium/cilium v1.14.0-snapshot.0.0.20230314084352-a8dde6ccd651
1716
github.com/cilium/hubble v0.11.1
18-
github.com/cilium/proxy v0.0.0-20230205220247-5b9c892d59cd
17+
github.com/cilium/proxy v0.0.0-20230224085913-505865fff55a
1918
github.com/cilium/workerpool v1.2.0
2019
github.com/cloudflare/cfssl v1.6.3
2120
github.com/go-openapi/strfmt v0.21.3
@@ -24,30 +23,23 @@ require (
2423
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
2524
github.com/spf13/cobra v1.6.1
2625
github.com/spf13/pflag v1.0.6-0.20200504143853-81378bbcd8a1
27-
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
26+
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0
2827
golang.org/x/mod v0.9.0
2928
google.golang.org/grpc v1.53.0
3029
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
3130
helm.sh/helm/v3 v3.11.2
32-
k8s.io/api v0.26.0
33-
k8s.io/apimachinery v0.26.0
31+
k8s.io/api v0.26.2
32+
k8s.io/apimachinery v0.26.2
3433
k8s.io/cli-runtime v0.26.0
35-
k8s.io/client-go v0.26.0
36-
k8s.io/klog/v2 v2.80.1
34+
k8s.io/client-go v0.26.2
35+
k8s.io/klog/v2 v2.90.1
3736
sigs.k8s.io/yaml v1.3.0
3837
)
3938

4039
require (
40+
cloud.google.com/go/compute v1.18.0 // indirect
4141
cloud.google.com/go/compute/metadata v0.2.3 // indirect
42-
github.com/benbjohnson/clock v1.3.0 // indirect
43-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
44-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
45-
github.com/tklauser/go-sysconf v0.3.11 // indirect
46-
github.com/tklauser/numcpus v0.6.0 // indirect
47-
)
48-
49-
require (
50-
cloud.google.com/go/compute v1.15.1 // indirect
42+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
5143
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5244
github.com/BurntSushi/toml v1.2.1 // indirect
5345
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -57,30 +49,32 @@ require (
5749
github.com/Masterminds/squirrel v1.5.3 // indirect
5850
github.com/andybalholm/brotli v1.0.1 // indirect
5951
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
52+
github.com/benbjohnson/clock v1.3.0 // indirect
6053
github.com/beorn7/perks v1.0.1 // indirect
6154
github.com/bgentry/speakeasy v0.1.0 // indirect
62-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
55+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
6356
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
6457
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6558
github.com/chai2010/gettext-go v1.0.2 // indirect
6659
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
6760
github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b // indirect
68-
github.com/containerd/containerd v1.6.15 // indirect
61+
github.com/containerd/containerd v1.7.0 // indirect
6962
github.com/coreos/go-semver v0.3.0 // indirect
7063
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7164
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
7265
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
7366
github.com/davecgh/go-spew v1.1.1 // indirect
7467
github.com/distribution/distribution v2.8.1+incompatible
75-
github.com/docker/cli v20.10.21+incompatible // indirect
68+
github.com/docker/cli v23.0.1+incompatible // indirect
7669
github.com/docker/distribution v2.8.1+incompatible // indirect
77-
github.com/docker/docker v20.10.21+incompatible // indirect
70+
github.com/docker/docker v23.0.1+incompatible // indirect
7871
github.com/docker/docker-credential-helpers v0.7.0 // indirect
7972
github.com/docker/go-connections v0.4.0 // indirect
8073
github.com/docker/go-metrics v0.0.1 // indirect
81-
github.com/docker/go-units v0.4.0 // indirect
74+
github.com/docker/go-units v0.5.0 // indirect
8275
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
8376
github.com/dustin/go-humanize v1.0.0 // indirect
77+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
8478
github.com/envoyproxy/go-control-plane v0.10.3 // indirect
8579
github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
8680
github.com/evanphx/json-patch v5.6.0+incompatible
@@ -99,9 +93,9 @@ require (
9993
github.com/go-openapi/jsonreference v0.20.0 // indirect
10094
github.com/go-openapi/loads v0.21.2 // indirect
10195
github.com/go-openapi/runtime v0.25.0 // indirect
102-
github.com/go-openapi/spec v0.20.7 // indirect
96+
github.com/go-openapi/spec v0.20.8 // indirect
10397
github.com/go-openapi/swag v0.22.3 // indirect
104-
github.com/go-openapi/validate v0.22.0 // indirect
98+
github.com/go-openapi/validate v0.22.1 // indirect
10599
github.com/gobwas/glob v0.2.3 // indirect
106100
github.com/gogo/protobuf v1.3.2 // indirect
107101
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
@@ -124,6 +118,7 @@ require (
124118
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
125119
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
126120
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
121+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
127122
github.com/hashicorp/hcl v1.0.0 // indirect
128123
github.com/huandu/xstrings v1.4.0 // indirect
129124
github.com/imdario/mergo v0.3.13 // indirect
@@ -133,7 +128,7 @@ require (
133128
github.com/jonboulle/clockwork v0.2.2 // indirect
134129
github.com/josharian/intern v1.0.0 // indirect
135130
github.com/json-iterator/go v1.1.12 // indirect
136-
github.com/klauspost/compress v1.13.6 // indirect
131+
github.com/klauspost/compress v1.16.0 // indirect
137132
github.com/klauspost/pgzip v1.2.5 // indirect
138133
github.com/kr/pretty v0.3.1 // indirect
139134
github.com/kr/text v0.2.0 // indirect
@@ -142,7 +137,7 @@ require (
142137
github.com/lib/pq v1.10.7 // indirect
143138
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
144139
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
145-
github.com/magiconair/properties v1.8.6 // indirect
140+
github.com/magiconair/properties v1.8.7 // indirect
146141
github.com/mailru/easyjson v0.7.7 // indirect
147142
github.com/mattn/go-colorable v0.1.13 // indirect
148143
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -164,10 +159,9 @@ require (
164159
github.com/oklog/ulid v1.3.1 // indirect
165160
github.com/olekukonko/tablewriter v0.0.5 // indirect
166161
github.com/opencontainers/go-digest v1.0.0 // indirect
167-
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
162+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
168163
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
169-
github.com/pelletier/go-toml v1.9.5 // indirect
170-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
164+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
171165
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
172166
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
173167
github.com/pierrec/lz4/v4 v4.1.2 // indirect
@@ -177,27 +171,29 @@ require (
177171
github.com/prometheus/client_golang v1.14.0 // indirect
178172
github.com/prometheus/client_model v0.3.0 // indirect
179173
github.com/prometheus/common v0.37.0 // indirect
180-
github.com/prometheus/procfs v0.8.0 // indirect
174+
github.com/prometheus/procfs v0.9.0 // indirect
181175
github.com/rivo/uniseg v0.2.0 // indirect
182176
github.com/rogpeppe/go-internal v1.9.0 // indirect
183177
github.com/rubenv/sql-migrate v1.3.1 // indirect
184178
github.com/russross/blackfriday/v2 v2.1.0 // indirect
185179
github.com/sasha-s/go-deadlock v0.3.1 // indirect
186-
github.com/shirou/gopsutil/v3 v3.23.1 // indirect
180+
github.com/shirou/gopsutil/v3 v3.23.2 // indirect
187181
github.com/shopspring/decimal v1.3.1 // indirect
188182
github.com/sirupsen/logrus v1.9.0 // indirect
189183
github.com/soheilhy/cmux v0.1.5 // indirect
190-
github.com/spf13/afero v1.9.2 // indirect
184+
github.com/spf13/afero v1.9.3 // indirect
191185
github.com/spf13/cast v1.5.0 // indirect
192186
github.com/spf13/jwalterweatherman v1.1.0 // indirect
193-
github.com/spf13/viper v1.14.0 // indirect
187+
github.com/spf13/viper v1.15.0 // indirect
194188
github.com/stretchr/testify v1.8.2
195-
github.com/subosito/gotenv v1.4.1 // indirect
189+
github.com/subosito/gotenv v1.4.2 // indirect
190+
github.com/tklauser/go-sysconf v0.3.11 // indirect
191+
github.com/tklauser/numcpus v0.6.0 // indirect
196192
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
197193
github.com/ulikunitz/xz v0.5.10 // indirect
198-
github.com/urfave/cli v1.22.5 // indirect
194+
github.com/urfave/cli v1.22.12 // indirect
199195
github.com/vishvananda/netlink v1.2.1-beta.2.0.20220608195807-1a118fe229fc // indirect
200-
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
196+
github.com/vishvananda/netns v0.0.4 // indirect
201197
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
202198
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
203199
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -208,7 +204,7 @@ require (
208204
github.com/yusufpapurcu/wmi v1.2.2 // indirect
209205
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
210206
github.com/zmap/zlint/v3 v3.1.0 // indirect
211-
go.etcd.io/bbolt v1.3.6 // indirect
207+
go.etcd.io/bbolt v1.3.7 // indirect
212208
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0 // indirect
213209
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0 // indirect
214210
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0 // indirect
@@ -221,43 +217,44 @@ require (
221217
go.etcd.io/etcd/tests/v3 v3.6.0-alpha.0 // indirect
222218
go.etcd.io/etcd/v3 v3.6.0-alpha.0 // indirect
223219
go.mongodb.org/mongo-driver v1.10.0 // indirect
224-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
225-
go.opentelemetry.io/otel v1.11.2 // indirect
226-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
227-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
228-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
229-
go.opentelemetry.io/otel/sdk v1.11.1 // indirect
230-
go.opentelemetry.io/otel/trace v1.11.2 // indirect
220+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
221+
go.opentelemetry.io/otel v1.14.0 // indirect
222+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
223+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
224+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
225+
go.opentelemetry.io/otel/metric v0.37.0 // indirect
226+
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
227+
go.opentelemetry.io/otel/trace v1.14.0 // indirect
231228
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
232229
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
233230
go.uber.org/atomic v1.9.0 // indirect
234-
go.uber.org/multierr v1.8.0 // indirect
235-
go.uber.org/zap v1.23.0 // indirect
236-
golang.org/x/crypto v0.5.0 // indirect
237-
golang.org/x/net v0.5.0 // indirect
231+
go.uber.org/multierr v1.10.0 // indirect
232+
go.uber.org/zap v1.24.0 // indirect
233+
golang.org/x/crypto v0.7.0 // indirect
234+
golang.org/x/net v0.8.0 // indirect
238235
golang.org/x/oauth2 v0.4.0 // indirect
239236
golang.org/x/sync v0.1.0 // indirect
240-
golang.org/x/sys v0.5.0 // indirect
241-
golang.org/x/term v0.4.0 // indirect
242-
golang.org/x/text v0.6.0 // indirect
243-
golang.org/x/time v0.2.0 // indirect
244-
golang.org/x/tools v0.3.0 // indirect
237+
golang.org/x/sys v0.6.0 // indirect
238+
golang.org/x/term v0.6.0 // indirect
239+
golang.org/x/text v0.8.0 // indirect
240+
golang.org/x/time v0.3.0 // indirect
241+
golang.org/x/tools v0.7.0 // indirect
245242
google.golang.org/appengine v1.6.7 // indirect
246-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
247-
google.golang.org/protobuf v1.28.1 // indirect
243+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
244+
google.golang.org/protobuf v1.29.0 // indirect
248245
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
249246
gopkg.in/inf.v0 v0.9.1 // indirect
250247
gopkg.in/ini.v1 v1.67.0 // indirect
251248
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
252249
gopkg.in/yaml.v2 v2.4.0 // indirect
253250
gopkg.in/yaml.v3 v3.0.1 // indirect
254251
k8s.io/apiextensions-apiserver v0.26.0 // indirect
255-
k8s.io/apiserver v0.26.0 // indirect
256-
k8s.io/component-base v0.26.0 // indirect
252+
k8s.io/apiserver v0.26.2 // indirect
253+
k8s.io/component-base v0.26.2 // indirect
257254
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
258255
k8s.io/kubectl v0.26.0 // indirect
259-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
260-
oras.land/oras-go v1.2.2 // indirect
256+
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
257+
oras.land/oras-go v1.2.3-0.20230313045143-cb5625556a37 // indirect
261258
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
262259
sigs.k8s.io/kustomize/api v0.12.1 // indirect
263260
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect

0 commit comments

Comments
 (0)