Skip to content

Commit 57cf438

Browse files
pablintinopablintino
committed
Fix dependencies
1 parent a0d42d8 commit 57cf438

File tree

3,364 files changed

+849071
-5440
lines changed

Some content is hidden

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

3,364 files changed

+849071
-5440
lines changed

‎go.mod‎

Lines changed: 104 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/apparentlymart/go-cidr v1.0.0
1111
github.com/ashcrow/osrelease v0.0.0-20180626175927-9b292693c55c
1212
github.com/clarketm/json v1.17.1
13-
github.com/containers/common v0.57.1
13+
github.com/containers/common v0.62.1
1414
github.com/containers/image/v5 v5.34.1
1515
github.com/containers/kubensmnt v1.2.0
1616
github.com/containers/storage v1.57.1
@@ -28,16 +28,22 @@ require (
2828
github.com/golangci/golangci-lint v1.62.0
2929
github.com/google/go-cmp v0.6.0
3030
github.com/google/renameio v0.1.0
31+
github.com/google/uuid v1.6.0
3132
github.com/imdario/mergo v0.3.16
33+
github.com/onsi/ginkgo/v2 v2.22.2
34+
github.com/onsi/gomega v1.36.2
3235
github.com/opencontainers/go-digest v1.0.0
36+
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250522124649-4ffcd156ec7c
3337
github.com/openshift/api v0.0.0-20250425163235-9b80d67473bc
3438
github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1
3539
github.com/openshift/library-go v0.0.0-20250129210218-fe56c2cf5d70
3640
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b
3741
github.com/prometheus/client_golang v1.20.5
42+
github.com/rs/zerolog v1.34.0
3843
github.com/spf13/cobra v1.8.1
3944
github.com/spf13/pflag v1.0.6
4045
github.com/stretchr/testify v1.10.0
46+
github.com/tidwall/sjson v1.2.5
4147
github.com/vincent-petithory/dataurl v1.0.0
4248
golang.org/x/net v0.37.0
4349
golang.org/x/time v0.9.0
@@ -51,38 +57,54 @@ require (
5157
k8s.io/cri-api v0.32.1
5258
k8s.io/kubectl v0.32.1
5359
k8s.io/kubelet v0.32.1
60+
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
5461
k8s.io/utils v0.0.0-20241210054802-24370beab758
5562
sigs.k8s.io/controller-runtime v0.20.1
5663
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240522175850-2e9781e9fc60
5764
)
5865

5966
require (
6067
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
68+
cel.dev/expr v0.18.0 // indirect
6169
github.com/4meepo/tagalign v1.3.4 // indirect
6270
github.com/Abirdcfly/dupword v0.1.3 // indirect
6371
github.com/Antonboom/testifylint v1.5.2 // indirect
6472
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
6573
github.com/Crocmagnon/fatcontext v0.5.3 // indirect
6674
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
75+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
6776
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6877
github.com/Masterminds/semver/v3 v3.3.0 // indirect
78+
github.com/Microsoft/go-winio v0.6.2 // indirect
79+
github.com/NYTimes/gziphandler v1.1.1 // indirect
6980
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
7081
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
7182
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
83+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7284
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
7385
github.com/aws/aws-sdk-go v1.55.5 // indirect
7486
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
7587
github.com/butuzov/mirror v1.3.0 // indirect
7688
github.com/catenacyber/perfsprint v0.7.1 // indirect
7789
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
90+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7891
github.com/chai2010/gettext-go v1.0.2 // indirect
7992
github.com/ckaznocha/intrange v0.3.0 // indirect
93+
github.com/container-storage-interface/spec v1.9.0 // indirect
94+
github.com/containerd/containerd/api v1.7.19 // indirect
95+
github.com/containerd/errdefs v0.3.0 // indirect
96+
github.com/containerd/log v0.1.0 // indirect
97+
github.com/containerd/ttrpc v1.2.5 // indirect
8098
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
99+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
100+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
81101
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
102+
github.com/felixge/httpsnoop v1.0.4 // indirect
82103
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
83104
github.com/ghostiam/protogetter v0.3.8 // indirect
84105
github.com/go-errors/errors v1.4.2 // indirect
85106
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
107+
github.com/go-logr/stdr v1.2.2 // indirect
86108
github.com/go-logr/zapr v1.3.0 // indirect
87109
github.com/go-openapi/analysis v0.23.0 // indirect
88110
github.com/go-openapi/errors v0.22.0 // indirect
@@ -91,36 +113,46 @@ require (
91113
github.com/go-openapi/spec v0.21.0 // indirect
92114
github.com/go-openapi/strfmt v0.23.0 // indirect
93115
github.com/go-openapi/validate v0.24.0 // indirect
116+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
94117
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
118+
github.com/godbus/dbus/v5 v5.1.0 // indirect
95119
github.com/golangci/go-printf-func-name v0.1.0 // indirect
96120
github.com/golangci/modinfo v0.3.4 // indirect
97121
github.com/golangci/plugin-module-register v0.1.1 // indirect
98122
github.com/google/btree v1.1.3 // indirect
123+
github.com/google/cadvisor v0.51.0 // indirect
124+
github.com/google/cel-go v0.22.0 // indirect
99125
github.com/google/gnostic-models v0.6.9 // indirect
126+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
100127
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
101128
github.com/gorilla/websocket v1.5.0 // indirect
102129
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
130+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect
131+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
103132
github.com/jjti/go-spancheck v0.6.4 // indirect
104133
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
134+
github.com/karrick/godirwalk v1.17.0 // indirect
105135
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
106136
github.com/kylelemons/godebug v1.1.0 // indirect
107137
github.com/lasiar/canonicalheader v1.1.2 // indirect
108138
github.com/ldez/grignotin v0.7.0 // indirect
109139
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
110140
github.com/macabu/inamedparam v0.1.3 // indirect
111141
github.com/maratori/testableexamples v1.0.0 // indirect
142+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
112143
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
113144
github.com/moby/spdystream v0.5.0 // indirect
114145
github.com/moby/sys/capability v0.4.0 // indirect
115146
github.com/moby/sys/user v0.3.0 // indirect
147+
github.com/moby/sys/userns v0.1.0 // indirect
116148
github.com/moby/term v0.5.0 // indirect
117149
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
118150
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
119151
github.com/nunnatsa/ginkgolinter v0.18.0 // indirect
120152
github.com/oklog/ulid v1.3.1 // indirect
121153
github.com/onsi/ginkgo v1.16.5 // indirect
122-
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
123-
github.com/onsi/gomega v1.36.2 // indirect
154+
github.com/opencontainers/runc v1.2.4 // indirect
155+
github.com/opencontainers/selinux v1.11.1 // indirect
124156
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
125157
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
126158
github.com/raeperd/recvcheck v0.1.2 // indirect
@@ -135,6 +167,10 @@ require (
135167
github.com/sigstore/fulcio v1.6.4 // indirect
136168
github.com/sigstore/rekor v1.3.8 // indirect
137169
github.com/sourcegraph/conc v0.3.0 // indirect
170+
github.com/stoewer/go-strcase v1.3.0 // indirect
171+
github.com/tidwall/gjson v1.14.2 // indirect
172+
github.com/tidwall/match v1.1.1 // indirect
173+
github.com/tidwall/pretty v1.2.0 // indirect
138174
github.com/timonwong/loggercheck v0.10.1 // indirect
139175
github.com/uudashr/iface v1.2.0 // indirect
140176
github.com/x448/float16 v0.8.4 // indirect
@@ -143,16 +179,39 @@ require (
143179
github.com/ykadowak/zerologlint v0.1.5 // indirect
144180
go-simpler.org/musttag v0.13.0 // indirect
145181
go-simpler.org/sloglint v0.7.2 // indirect
182+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
183+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
184+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
146185
go.mongodb.org/mongo-driver v1.14.0 // indirect
186+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
187+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
147188
go.opentelemetry.io/otel v1.31.0 // indirect
189+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
190+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
191+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
192+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
148193
go.opentelemetry.io/otel/trace v1.31.0 // indirect
194+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
195+
go.uber.org/atomic v1.9.0 // indirect
149196
go.uber.org/automaxprocs v1.6.0 // indirect
197+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
150198
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
151199
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
152200
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
201+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
153202
k8s.io/cli-runtime v0.32.1 // indirect
154-
k8s.io/gengo v0.0.0-20250106234829-0359904fc2a6 // indirect
203+
k8s.io/cloud-provider v0.0.0 // indirect
204+
k8s.io/component-helpers v0.32.1 // indirect
205+
k8s.io/controller-manager v0.32.1 // indirect
206+
k8s.io/cri-client v0.0.0 // indirect
207+
k8s.io/csi-translation-lib v0.0.0 // indirect
208+
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
155209
k8s.io/gengo/v2 v2.0.0-20250106234829-0359904fc2a6 // indirect
210+
k8s.io/kms v0.32.1 // indirect
211+
k8s.io/kube-scheduler v0.0.0 // indirect
212+
k8s.io/mount-utils v0.0.0 // indirect
213+
k8s.io/pod-security-admission v0.0.0 // indirect
214+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
156215
sigs.k8s.io/kustomize/api v0.18.0 // indirect
157216
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
158217
)
@@ -225,7 +284,6 @@ require (
225284
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
226285
github.com/google/go-containerregistry v0.20.2 // indirect
227286
github.com/google/gofuzz v1.2.0 // indirect
228-
github.com/google/uuid v1.6.0 // indirect
229287
github.com/gordonklaus/ineffassign v0.1.0 // indirect
230288
github.com/gorilla/mux v1.8.1 // indirect
231289
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
@@ -322,7 +380,7 @@ require (
322380
go.uber.org/zap v1.27.0 // indirect
323381
go4.org v0.0.0-20200104003542-c7e774b10ea0 // indirect
324382
golang.org/x/crypto v0.36.0 // indirect
325-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
383+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
326384
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
327385
golang.org/x/mod v0.22.0 // indirect
328386
golang.org/x/oauth2 v0.25.0 // indirect
@@ -337,7 +395,7 @@ require (
337395
gopkg.in/yaml.v2 v2.4.0
338396
gopkg.in/yaml.v3 v3.0.1 // indirect
339397
honnef.co/go/tools v0.5.1 // indirect
340-
k8s.io/apiserver v0.32.1 // indirect
398+
k8s.io/apiserver v0.32.1
341399
k8s.io/klog/v2 v2.130.1
342400
k8s.io/kube-aggregator v0.32.1 // indirect
343401
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
@@ -349,4 +407,42 @@ require (
349407
sigs.k8s.io/yaml v1.4.0
350408
)
351409

352-
replace k8s.io/kube-openapi => github.com/openshift/kube-openapi v0.0.0-20230816122517-ffc8f001abb0
410+
replace (
411+
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12
412+
413+
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250131233843-55625722a4b8
414+
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250131233843-55625722a4b8
415+
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250131233843-55625722a4b8
416+
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250131233843-55625722a4b8
417+
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250131233843-55625722a4b8
418+
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250131233843-55625722a4b8
419+
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250131233843-55625722a4b8
420+
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250131233843-55625722a4b8
421+
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250131233843-55625722a4b8
422+
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250131233843-55625722a4b8
423+
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250131233843-55625722a4b8
424+
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250131233843-55625722a4b8
425+
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250131233843-55625722a4b8
426+
k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250131233843-55625722a4b8
427+
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250131233843-55625722a4b8
428+
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250131233843-55625722a4b8
429+
k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250131233843-55625722a4b8
430+
k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250131233843-55625722a4b8
431+
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250131233843-55625722a4b8
432+
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250131233843-55625722a4b8
433+
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250131233843-55625722a4b8
434+
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250131233843-55625722a4b8
435+
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250131233843-55625722a4b8
436+
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250131233843-55625722a4b8
437+
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250131233843-55625722a4b8
438+
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250131233843-55625722a4b8
439+
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250131233843-55625722a4b8
440+
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250131233843-55625722a4b8
441+
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250131233843-55625722a4b8
442+
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250131233843-55625722a4b8
443+
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250131233843-55625722a4b8
444+
)
445+
446+
// The cadvisor version used in k8s v1.32.1 (v0.51.0) relies on code present on this version
447+
// This can be removed once it's no longer used in o/k
448+
replace github.com/containerd/errdefs => github.com/containerd/errdefs v0.1.0

0 commit comments

Comments
 (0)