Skip to content

Commit d46b8c0

Browse files
committed
go.mod updates
1 parent 39e8346 commit d46b8c0

8 files changed

Lines changed: 1753 additions & 1125 deletions

File tree

go.mod

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,21 @@ module github.com/openshift/machine-api-operator
22

33
go 1.25.0
44

5-
// These are needed for the OTE tests. Due to how we get the kubeconfig from the command line, there doesn't seem to be
6-
// an API yet we can leverage so that I do not have to copy what openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext did to initialize.
7-
replace (
8-
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20260303184444-1cc650aa0565
9-
10-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20260305123649-d18f3f005eaa // openshift kubernetes has very old copy of k8s.io/kubernetes/pkg/kubelet/server/server.go
11-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20260305123649-d18f3f005eaa // openshift kubernetes has very old copy of k8s.io/kubernetes/cmd/kubelet/app/options/options.go
12-
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20260305123649-d18f3f005eaa
13-
)
14-
155
require (
166
github.com/blang/semver v3.5.1+incompatible
177
github.com/go-logr/logr v1.4.3
188
github.com/golangci/golangci-lint v1.64.8
199
github.com/google/uuid v1.6.0
2010
github.com/onsi/ginkgo/v2 v2.28.1
2111
github.com/onsi/gomega v1.39.1
22-
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
2312
github.com/openshift/api v0.0.0-20260429211050-21ed4c20b122
2413
github.com/openshift/client-go v0.0.0-20260429123927-c81f86abfa6a
2514
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250910145856-21d03d30056d
2615
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20251029084908-344babe6a957
2716
github.com/openshift/controller-runtime-common v0.0.0-20260428152732-64ee174f5e2e
2817
github.com/openshift/library-go v0.0.0-20260318142011-72bf34f474bc
2918
github.com/prometheus/client_golang v1.23.2
30-
github.com/spf13/cobra v1.10.1
19+
github.com/spf13/cobra v1.10.2
3120
github.com/spf13/pflag v1.0.10
3221
github.com/stretchr/testify v1.11.1
3322
github.com/vmware/govmomi v0.52.0
@@ -40,15 +29,8 @@ require (
4029
k8s.io/client-go v0.35.2
4130
k8s.io/cloud-provider-vsphere v1.32.2
4231
k8s.io/component-base v0.35.1
43-
k8s.io/cri-client v0.35.1 // indirect
44-
k8s.io/csi-translation-lib v0.35.1 // indirect
45-
k8s.io/dynamic-resource-allocation v0.35.1 // indirect
4632
k8s.io/klog/v2 v2.130.1
47-
k8s.io/kube-scheduler v0.35.1 // indirect
4833
k8s.io/kubectl v0.35.1
49-
k8s.io/kubernetes v1.35.1
50-
k8s.io/mount-utils v0.35.1 // indirect
51-
k8s.io/sample-apiserver v0.35.1 // indirect
5234
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
5335
sigs.k8s.io/cluster-api v1.11.3
5436
sigs.k8s.io/controller-runtime v0.23.3
@@ -57,13 +39,12 @@ require (
5739
sigs.k8s.io/yaml v1.6.0
5840
)
5941

60-
require github.com/pkg/errors v0.9.1
42+
require github.com/pkg/errors v0.9.1 // indirect
6143

6244
require (
6345
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
6446
4d63.com/gochecknoglobals v0.2.2 // indirect
6547
cel.dev/expr v0.24.0 // indirect
66-
cyphar.com/go-pathrs v0.2.1 // indirect
6748
github.com/4meepo/tagalign v1.4.2 // indirect
6849
github.com/Abirdcfly/dupword v0.1.3 // indirect
6950
github.com/Antonboom/errname v1.0.0 // indirect
@@ -74,20 +55,15 @@ require (
7455
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
7556
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
7657
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
77-
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
7858
github.com/MakeNowJust/heredoc v1.0.0 // indirect
7959
github.com/Masterminds/semver/v3 v3.4.0 // indirect
80-
github.com/Microsoft/go-winio v0.6.2 // indirect
81-
github.com/Microsoft/hnslib v0.1.2 // indirect
82-
github.com/NYTimes/gziphandler v1.1.1 // indirect
8360
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
8461
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
8562
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
8663
github.com/alexkohler/prealloc v1.0.0 // indirect
8764
github.com/alingse/asasalint v0.0.11 // indirect
8865
github.com/alingse/nilnesserr v0.1.2 // indirect
8966
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
90-
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
9167
github.com/ashanbrown/forbidigo v1.6.0 // indirect
9268
github.com/ashanbrown/makezero v1.2.0 // indirect
9369
github.com/beorn7/perks v1.0.1 // indirect
@@ -107,29 +83,15 @@ require (
10783
github.com/charithe/durationcheck v0.0.10 // indirect
10884
github.com/chavacava/garif v0.1.0 // indirect
10985
github.com/ckaznocha/intrange v0.3.0 // indirect
110-
github.com/container-storage-interface/spec v1.9.0 // indirect
111-
github.com/containerd/containerd/api v1.9.0 // indirect
112-
github.com/containerd/errdefs v1.0.0 // indirect
113-
github.com/containerd/errdefs/pkg v0.3.0 // indirect
114-
github.com/containerd/log v0.1.0 // indirect
115-
github.com/containerd/ttrpc v1.2.7 // indirect
116-
github.com/containerd/typeurl/v2 v2.2.3 // indirect
117-
github.com/coreos/go-semver v0.3.1 // indirect
118-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
11986
github.com/curioswitch/go-reassign v0.3.0 // indirect
120-
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
12187
github.com/daixiang0/gci v0.13.5 // indirect
12288
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
12389
github.com/denis-tingaikin/go-header v0.5.0 // indirect
124-
github.com/distribution/reference v0.6.0 // indirect
125-
github.com/docker/go-units v0.5.0 // indirect
12690
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
12791
github.com/ettle/strcase v0.2.0 // indirect
128-
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
12992
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
13093
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
13194
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
132-
github.com/fatih/camelcase v1.0.0 // indirect
13395
github.com/fatih/color v1.18.0 // indirect
13496
github.com/fatih/structtag v1.2.0 // indirect
13597
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -157,10 +119,7 @@ require (
157119
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
158120
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
159121
github.com/gobwas/glob v0.2.3 // indirect
160-
github.com/godbus/dbus/v5 v5.1.0 // indirect
161122
github.com/gofrs/flock v0.12.1 // indirect
162-
github.com/gogo/protobuf v1.3.2 // indirect
163-
github.com/golang/protobuf v1.5.4 // indirect
164123
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
165124
github.com/golangci/go-printf-func-name v0.1.0 // indirect
166125
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
@@ -169,19 +128,16 @@ require (
169128
github.com/golangci/revgrep v0.8.0 // indirect
170129
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
171130
github.com/google/btree v1.1.3 // indirect
172-
github.com/google/cadvisor v0.53.0 // indirect
173131
github.com/google/cel-go v0.26.0 // indirect
174132
github.com/google/gnostic-models v0.7.0 // indirect
175133
github.com/google/go-cmp v0.7.0 // indirect
176134
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
177135
github.com/gordonklaus/ineffassign v0.1.0 // indirect
178-
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
179136
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
180137
github.com/gostaticanalysis/comment v1.5.0 // indirect
181138
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
182139
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
183140
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
184-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
185141
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
186142
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
187143
github.com/hashicorp/go-version v1.7.0 // indirect
@@ -196,20 +152,17 @@ require (
196152
github.com/json-iterator/go v1.1.12 // indirect
197153
github.com/julz/importas v0.2.0 // indirect
198154
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
199-
github.com/karrick/godirwalk v1.17.0 // indirect
200155
github.com/kisielk/errcheck v1.9.0 // indirect
201156
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
202157
github.com/kulti/thelper v0.6.3 // indirect
203158
github.com/kunwardeep/paralleltest v1.0.10 // indirect
204-
github.com/kylelemons/godebug v1.1.0 // indirect
205159
github.com/lasiar/canonicalheader v1.1.2 // indirect
206160
github.com/ldez/exptostd v0.4.2 // indirect
207161
github.com/ldez/gomoddirectives v0.6.1 // indirect
208162
github.com/ldez/grignotin v0.9.0 // indirect
209163
github.com/ldez/tagliatelle v0.7.1 // indirect
210164
github.com/ldez/usetesting v0.4.2 // indirect
211165
github.com/leonklingele/grouper v1.1.2 // indirect
212-
github.com/libopenstorage/openstorage v1.0.0 // indirect
213166
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
214167
github.com/macabu/inamedparam v0.1.3 // indirect
215168
github.com/mailru/easyjson v0.7.7 // indirect
@@ -220,30 +173,19 @@ require (
220173
github.com/mattn/go-isatty v0.0.20 // indirect
221174
github.com/mattn/go-runewidth v0.0.16 // indirect
222175
github.com/mgechev/revive v1.7.0 // indirect
223-
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
224176
github.com/mitchellh/go-homedir v1.1.0 // indirect
225177
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
226-
github.com/moby/spdystream v0.5.0 // indirect
227-
github.com/moby/sys/mountinfo v0.7.2 // indirect
228-
github.com/moby/sys/userns v0.1.0 // indirect
229178
github.com/moby/term v0.5.0 // indirect
230179
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
231180
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
232-
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
233181
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
234182
github.com/moricho/tparallel v0.3.2 // indirect
235183
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
236-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
237184
github.com/nakabonne/nestif v0.3.1 // indirect
238185
github.com/nishanths/exhaustive v0.12.0 // indirect
239186
github.com/nishanths/predeclared v0.2.2 // indirect
240187
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
241188
github.com/olekukonko/tablewriter v0.0.5 // indirect
242-
github.com/opencontainers/cgroups v0.0.3 // indirect
243-
github.com/opencontainers/go-digest v1.0.0 // indirect
244-
github.com/opencontainers/image-spec v1.1.1 // indirect
245-
github.com/opencontainers/runtime-spec v1.2.1 // indirect
246-
github.com/opencontainers/selinux v1.13.0 // indirect
247189
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
248190
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
249191
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -259,7 +201,6 @@ require (
259201
github.com/raeperd/recvcheck v0.2.0 // indirect
260202
github.com/rivo/uniseg v0.4.7 // indirect
261203
github.com/robfig/cron v1.2.0 // indirect
262-
github.com/robfig/cron/v3 v3.0.1 // indirect
263204
github.com/rogpeppe/go-internal v1.14.1 // indirect
264205
github.com/russross/blackfriday/v2 v2.1.0 // indirect
265206
github.com/ryancurrah/gomodguard v1.3.5 // indirect
@@ -303,12 +244,7 @@ require (
303244
gitlab.com/bosi/decorder v0.4.2 // indirect
304245
go-simpler.org/musttag v0.13.0 // indirect
305246
go-simpler.org/sloglint v0.9.0 // indirect
306-
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
307-
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
308-
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
309247
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
310-
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0 // indirect
311-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
312248
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
313249
go.opentelemetry.io/otel v1.36.0 // indirect
314250
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
@@ -317,13 +253,11 @@ require (
317253
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
318254
go.opentelemetry.io/otel/trace v1.36.0 // indirect
319255
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
320-
go.uber.org/atomic v1.11.0 // indirect
321256
go.uber.org/automaxprocs v1.6.0 // indirect
322257
go.uber.org/multierr v1.11.0 // indirect
323258
go.uber.org/zap v1.27.0 // indirect
324259
go.yaml.in/yaml/v2 v2.4.3 // indirect
325260
go.yaml.in/yaml/v3 v3.0.4 // indirect
326-
golang.org/x/crypto v0.47.0 // indirect
327261
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
328262
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
329263
golang.org/x/mod v0.32.0 // indirect
@@ -340,25 +274,15 @@ require (
340274
google.golang.org/grpc v1.72.2 // indirect
341275
google.golang.org/protobuf v1.36.8 // indirect
342276
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
343-
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
344277
gopkg.in/inf.v0 v0.9.1 // indirect
345-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
346278
gopkg.in/warnings.v0 v0.1.2 // indirect
347279
gopkg.in/yaml.v2 v2.4.0 // indirect
348280
gopkg.in/yaml.v3 v3.0.1 // indirect
349281
honnef.co/go/tools v0.6.1 // indirect
350282
k8s.io/apiextensions-apiserver v0.35.1 // indirect
351283
k8s.io/cli-runtime v0.35.1 // indirect
352-
k8s.io/cloud-provider v0.35.1 // indirect
353-
k8s.io/cluster-bootstrap v0.35.1 // indirect
354-
k8s.io/component-helpers v0.35.1 // indirect
355-
k8s.io/controller-manager v0.35.1 // indirect
356-
k8s.io/cri-api v0.35.1 // indirect
357-
k8s.io/kms v0.35.1 // indirect
358284
k8s.io/kube-aggregator v0.35.1 // indirect
359285
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
360-
k8s.io/kubelet v0.35.1 // indirect
361-
k8s.io/pod-security-admission v0.35.1 // indirect
362286
mvdan.cc/gofumpt v0.7.0 // indirect
363287
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
364288
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect

0 commit comments

Comments
 (0)