Skip to content

Commit 178bb01

Browse files
committed
Vendor updates
1 parent 2488b27 commit 178bb01

File tree

2,744 files changed

+164071
-342050
lines changed

Some content is hidden

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

2,744 files changed

+164071
-342050
lines changed

go.mod

Lines changed: 69 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ go 1.24.0
66
// 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.
77
replace (
88
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12
9-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250716113245-b94367cabf3e // openshift kubernetes has very old copy of k8s.io/kubernetes/pkg/kubelet/server/server.go
10-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250716113245-b94367cabf3e // openshift kubernetes has very old copy of k8s.io/kubernetes/cmd/kubelet/app/options/options.go:
11-
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250716113245-b94367cabf3e //v1.30.1-0.20250704150419-38c60a516ecb
9+
// I was able to remove the following by removing the namespace checking logic of OTE. Current assumption is origin is making sure all permissions are set before launching OTE.
10+
//k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250716113245-b94367cabf3e // 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-20250716113245-b94367cabf3e // 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.20250716113245-b94367cabf3e //v1.30.1-0.20250704150419-38c60a516ecb
1213
)
1314

1415
require (
@@ -19,48 +20,48 @@ require (
1920
github.com/onsi/ginkgo/v2 v2.23.4
2021
github.com/onsi/gomega v1.37.0
2122
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250711173707-dc2a20e5a5f8
22-
github.com/openshift/api v0.0.0-20251009093019-7837a801e8c1
23-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
23+
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7
24+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
2425
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250718085303-e712b1ebf374
2526
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20250424110138-1dbf0c7a5d51
26-
github.com/openshift/library-go v0.0.0-20250711143941-47604345e7ea
27+
github.com/openshift/library-go v0.0.0-20251021141706-f489e811f030
2728
github.com/prometheus/client_golang v1.22.0
2829
github.com/spf13/cobra v1.9.1
2930
github.com/spf13/pflag v1.0.6
3031
github.com/stretchr/testify v1.10.0
3132
github.com/vmware/govmomi v0.46.3
32-
golang.org/x/net v0.38.0
33+
golang.org/x/net v0.43.0
3334
golang.org/x/time v0.10.0
3435
gopkg.in/gcfg.v1 v1.2.3 // indirect
35-
k8s.io/api v0.33.3
36-
k8s.io/apimachinery v0.33.3
37-
k8s.io/apiserver v0.33.3
38-
k8s.io/client-go v0.33.3
36+
k8s.io/api v0.34.1
37+
k8s.io/apimachinery v0.34.1
38+
k8s.io/apiserver v0.34.1
39+
k8s.io/client-go v0.34.1
3940
k8s.io/cloud-provider-vsphere v1.32.2
40-
k8s.io/component-base v0.33.3
41-
k8s.io/cri-client v0.33.3 // indirect
42-
k8s.io/csi-translation-lib v0.33.3 // indirect
43-
k8s.io/dynamic-resource-allocation v0.33.3 // indirect
41+
k8s.io/component-base v0.34.1
42+
k8s.io/cri-client v0.34.1 // indirect
43+
k8s.io/csi-translation-lib v0.34.1 // indirect
44+
k8s.io/dynamic-resource-allocation v0.34.1 // indirect
4445
k8s.io/klog/v2 v2.130.1
45-
k8s.io/kube-scheduler v0.33.3 // indirect
46-
k8s.io/kubectl v0.33.3
47-
k8s.io/kubernetes v1.33.3
46+
k8s.io/kube-scheduler v0.34.1 // indirect
47+
k8s.io/kubectl v0.34.1
48+
k8s.io/kubernetes v1.34.1
4849
k8s.io/mount-utils v0.33.3 // indirect
4950
k8s.io/sample-apiserver v0.33.3 // indirect
50-
k8s.io/utils v0.0.0-20241210054802-24370beab758
51+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
5152
sigs.k8s.io/cluster-api v1.9.4
5253
sigs.k8s.io/controller-runtime v0.20.1
5354
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c
5455
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
55-
sigs.k8s.io/yaml v1.4.0
56+
sigs.k8s.io/yaml v1.6.0
5657
)
5758

5859
require github.com/pkg/errors v0.9.1
5960

6061
require (
6162
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
6263
4d63.com/gochecknoglobals v0.2.2 // indirect
63-
cel.dev/expr v0.19.1 // indirect
64+
cel.dev/expr v0.24.0 // indirect
6465
github.com/4meepo/tagalign v1.4.2 // indirect
6566
github.com/Abirdcfly/dupword v0.1.3 // indirect
6667
github.com/Antonboom/errname v1.0.0 // indirect
@@ -121,19 +122,18 @@ require (
121122
github.com/distribution/reference v0.6.0 // indirect
122123
github.com/docker/docker v27.1.2+incompatible // indirect
123124
github.com/docker/go-units v0.5.0 // indirect
124-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
125+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
125126
github.com/ettle/strcase v0.2.0 // indirect
126127
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
127128
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
128129
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
129130
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
130-
github.com/fatih/camelcase v1.0.0 // indirect
131131
github.com/fatih/color v1.18.0 // indirect
132132
github.com/fatih/structtag v1.2.0 // indirect
133133
github.com/felixge/httpsnoop v1.0.4 // indirect
134134
github.com/firefart/nonamedreturns v1.0.5 // indirect
135-
github.com/fsnotify/fsnotify v1.8.0 // indirect
136-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
135+
github.com/fsnotify/fsnotify v1.9.0 // indirect
136+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
137137
github.com/fzipp/gocyclo v0.6.0 // indirect
138138
github.com/ghostiam/protogetter v0.3.9 // indirect
139139
github.com/go-critic/go-critic v0.12.0 // indirect
@@ -168,11 +168,10 @@ require (
168168
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
169169
github.com/google/btree v1.1.3 // indirect
170170
github.com/google/cadvisor v0.52.1 // indirect
171-
github.com/google/cel-go v0.23.2 // indirect
172-
github.com/google/gnostic-models v0.6.9 // indirect
171+
github.com/google/cel-go v0.26.0 // indirect
172+
github.com/google/gnostic-models v0.7.0 // indirect
173173
github.com/google/go-cmp v0.7.0 // indirect
174174
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
175-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
176175
github.com/gordonklaus/ineffassign v0.1.0 // indirect
177176
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
178177
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
@@ -181,7 +180,7 @@ require (
181180
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
182181
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
183182
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
184-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
183+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
185184
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
186185
github.com/hashicorp/go-version v1.7.0 // indirect
187186
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -230,7 +229,7 @@ require (
230229
github.com/moby/sys/userns v0.1.0 // indirect
231230
github.com/moby/term v0.5.0 // indirect
232231
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
233-
github.com/modern-go/reflect2 v1.0.2 // indirect
232+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
234233
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
235234
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
236235
github.com/moricho/tparallel v0.3.2 // indirect
@@ -244,7 +243,6 @@ require (
244243
github.com/opencontainers/cgroups v0.0.1 // indirect
245244
github.com/opencontainers/go-digest v1.0.0 // indirect
246245
github.com/opencontainers/image-spec v1.1.1 // indirect
247-
github.com/opencontainers/runc v1.2.5 // indirect
248246
github.com/opencontainers/runtime-spec v1.2.0 // indirect
249247
github.com/opencontainers/selinux v1.11.1 // indirect
250248
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -306,66 +304,70 @@ require (
306304
gitlab.com/bosi/decorder v0.4.2 // indirect
307305
go-simpler.org/musttag v0.13.0 // indirect
308306
go-simpler.org/sloglint v0.9.0 // indirect
309-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
310-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
311-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
307+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
308+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
309+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
312310
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
313-
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
314-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
311+
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0 // indirect
312+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
315313
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
316-
go.opentelemetry.io/otel v1.34.0 // indirect
317-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
318-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
319-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
320-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
321-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
322-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
323-
go.uber.org/atomic v1.9.0 // indirect
314+
go.opentelemetry.io/otel v1.35.0 // indirect
315+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
316+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
317+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
318+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
319+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
320+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
324321
go.uber.org/automaxprocs v1.6.0 // indirect
325322
go.uber.org/multierr v1.11.0 // indirect
326323
go.uber.org/zap v1.27.0 // indirect
327-
golang.org/x/crypto v0.36.0 // indirect
324+
go.yaml.in/yaml/v2 v2.4.2 // indirect
325+
go.yaml.in/yaml/v3 v3.0.4 // indirect
326+
golang.org/x/crypto v0.42.0 // indirect
328327
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
329328
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
330-
golang.org/x/mod v0.24.0 // indirect
329+
golang.org/x/mod v0.27.0 // indirect
331330
golang.org/x/oauth2 v0.27.0 // indirect
332-
golang.org/x/sync v0.14.0 // indirect
333-
golang.org/x/sys v0.31.0 // indirect
334-
golang.org/x/term v0.30.0 // indirect
335-
golang.org/x/text v0.25.0 // indirect
336-
golang.org/x/tools v0.31.0 // indirect
331+
golang.org/x/sync v0.17.0 // indirect
332+
golang.org/x/sys v0.36.0 // indirect
333+
golang.org/x/term v0.35.0 // indirect
334+
golang.org/x/text v0.29.0 // indirect
335+
golang.org/x/tools v0.36.0 // indirect
336+
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
337+
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
337338
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
338-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
339-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
340-
google.golang.org/grpc v1.70.0 // indirect
339+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
340+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
341+
google.golang.org/grpc v1.72.1 // indirect
341342
google.golang.org/protobuf v1.36.5 // indirect
342343
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
343-
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
344344
gopkg.in/inf.v0 v0.9.1 // indirect
345345
gopkg.in/ini.v1 v1.67.0 // indirect
346346
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
347347
gopkg.in/warnings.v0 v0.1.2 // indirect
348348
gopkg.in/yaml.v2 v2.4.0 // indirect
349349
gopkg.in/yaml.v3 v3.0.1 // indirect
350350
honnef.co/go/tools v0.6.1 // indirect
351-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
352-
k8s.io/cli-runtime v0.33.3 // indirect
351+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
352+
k8s.io/cli-runtime v0.34.1 // indirect
353353
k8s.io/cloud-provider v0.32.0 // indirect
354-
k8s.io/cluster-bootstrap v0.31.3 // indirect
355-
k8s.io/component-helpers v0.33.3 // indirect
354+
k8s.io/component-helpers v0.34.1 // indirect
356355
k8s.io/controller-manager v0.32.1 // indirect
357-
k8s.io/cri-api v0.33.3 // indirect
358-
k8s.io/kms v0.33.3 // indirect
359-
k8s.io/kube-aggregator v0.33.2 // indirect
360-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
361-
k8s.io/kubelet v0.33.3 // indirect
356+
k8s.io/cri-api v0.34.1 // indirect
357+
k8s.io/kms v0.34.1 // indirect
358+
k8s.io/kube-aggregator v0.34.1 // indirect
359+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
360+
k8s.io/kubelet v0.34.1 // indirect
362361
k8s.io/pod-security-admission v0.32.2 // indirect
363362
mvdan.cc/gofumpt v0.7.0 // indirect
364363
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
365364
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
366365
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
367-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
368-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
366+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
367+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
369368
sigs.k8s.io/randfill v1.0.0 // indirect
370-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
369+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
371370
)
371+
372+
// go get github.com/vr4manta/api@SPLAT-2206
373+
replace github.com/openshift/api => github.com/vr4manta/api v0.0.0-20251022143052-8c86997a76ac

0 commit comments

Comments
 (0)