Skip to content

Commit d275040

Browse files
Merge pull request #10120 from jcpowermac/capv-bump
OCPBUGS-60765: Bump capv to v1.14.0
2 parents 00584fe + 47984c8 commit d275040

File tree

2,952 files changed

+249051
-127830
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,952 files changed

+249051
-127830
lines changed
Lines changed: 86 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,128 @@
11
module openshift/installer/cluster-api/providers/vsphere
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.5
5+
require sigs.k8s.io/cluster-api-provider-vsphere v1.14.0
66

7-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.1
8-
9-
require sigs.k8s.io/cluster-api-provider-vsphere v1.12.0-rc.0.0.20250203113257-38f6b67f9b7d
7+
require sigs.k8s.io/cluster-api v1.11.3 // indirect
108

119
replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505
1210

13-
replace github.com/vmware-tanzu/nsx-operator/pkg/apis => github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240827061921-8f0982975508
14-
1511
require (
1612
github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d // indirect
13+
github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d // indirect
1714
// The version of vm-operator should be kept in sync with the manifests at: config/deployments/integration-tests
1815
github.com/vmware-tanzu/vm-operator/api v1.8.6 // indirect
1916
github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505 // indirect
20-
github.com/vmware/govmomi v0.47.1 // indirect
17+
github.com/vmware/govmomi v0.51.0 // indirect
2118
)
2219

2320
require (
24-
cel.dev/expr v0.18.0 // indirect
21+
cel.dev/expr v0.25.1 // indirect
22+
dario.cat/mergo v1.0.2 // indirect
2523
github.com/NYTimes/gziphandler v1.1.1 // indirect
26-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
27-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
24+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2825
github.com/beorn7/perks v1.0.1 // indirect
2926
github.com/blang/semver v3.5.1+incompatible // indirect
3027
github.com/blang/semver/v4 v4.0.0 // indirect
31-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
28+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3229
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3330
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
34-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
35-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
31+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
32+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3633
github.com/felixge/httpsnoop v1.0.4 // indirect
37-
github.com/fsnotify/fsnotify v1.7.0 // indirect
38-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
39-
github.com/go-logr/logr v1.4.2 // indirect
34+
github.com/fsnotify/fsnotify v1.9.0 // indirect
35+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
36+
github.com/go-logr/logr v1.4.3 // indirect
4037
github.com/go-logr/stdr v1.2.2 // indirect
4138
github.com/go-logr/zapr v1.3.0 // indirect
42-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
43-
github.com/go-openapi/jsonreference v0.20.2 // indirect
44-
github.com/go-openapi/swag v0.23.0 // indirect
39+
github.com/go-openapi/jsonpointer v0.22.3 // indirect
40+
github.com/go-openapi/jsonreference v0.21.3 // indirect
41+
github.com/go-openapi/swag v0.25.4 // indirect
42+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
43+
github.com/go-openapi/swag/conv v0.25.4 // indirect
44+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
45+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
46+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
47+
github.com/go-openapi/swag/loading v0.25.4 // indirect
48+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
49+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
50+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
51+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
52+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
4553
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4654
github.com/gobuffalo/flect v1.0.3 // indirect
4755
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/protobuf v1.5.4 // indirect
4956
github.com/google/btree v1.1.3 // indirect
50-
github.com/google/cel-go v0.22.0 // indirect
51-
github.com/google/gnostic-models v0.6.8 // indirect
52-
github.com/google/go-cmp v0.6.0 // indirect
53-
github.com/google/gofuzz v1.2.0 // indirect
57+
github.com/google/cel-go v0.26.1 // indirect
58+
github.com/google/gnostic-models v0.7.1 // indirect
59+
github.com/google/go-cmp v0.7.0 // indirect
5460
github.com/google/uuid v1.6.0 // indirect
55-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
61+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
5662
github.com/inconshreveable/mousetrap v1.1.0 // indirect
57-
github.com/josharian/intern v1.0.0 // indirect
5863
github.com/json-iterator/go v1.1.12 // indirect
59-
github.com/mailru/easyjson v0.7.7 // indirect
64+
github.com/kylelemons/godebug v1.1.0 // indirect
6065
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
61-
github.com/modern-go/reflect2 v1.0.2 // indirect
66+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6267
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
63-
github.com/onsi/gomega v1.36.2 // indirect
68+
github.com/onsi/gomega v1.38.2 // indirect
6469
github.com/pkg/errors v0.9.1 // indirect
65-
github.com/prometheus/client_golang v1.19.1 // indirect
66-
github.com/prometheus/client_model v0.6.1 // indirect
67-
github.com/prometheus/common v0.55.0 // indirect
68-
github.com/prometheus/procfs v0.15.1 // indirect
69-
github.com/spf13/cobra v1.8.1 // indirect
70-
github.com/spf13/pflag v1.0.5 // indirect
71-
github.com/stoewer/go-strcase v1.3.0 // indirect
72-
github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d // indirect
70+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
71+
github.com/prometheus/client_golang v1.23.2 // indirect
72+
github.com/prometheus/client_model v0.6.2 // indirect
73+
github.com/prometheus/common v0.67.4 // indirect
74+
github.com/prometheus/procfs v0.19.2 // indirect
75+
github.com/spf13/cast v1.10.0 // indirect
76+
github.com/spf13/cobra v1.10.1 // indirect
77+
github.com/spf13/pflag v1.0.10 // indirect
78+
github.com/stoewer/go-strcase v1.3.1 // indirect
7379
github.com/x448/float16 v0.8.4 // indirect
74-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
75-
go.opentelemetry.io/otel v1.28.0 // indirect
76-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
77-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
78-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
79-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
80-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
81-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
80+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
81+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
82+
go.opentelemetry.io/otel v1.38.0 // indirect
83+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
84+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
85+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
86+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
87+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
88+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
8289
go.uber.org/multierr v1.11.0 // indirect
83-
go.uber.org/zap v1.27.0 // indirect
84-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
85-
golang.org/x/net v0.34.0 // indirect
86-
golang.org/x/oauth2 v0.25.0 // indirect
87-
golang.org/x/sync v0.10.0 // indirect
88-
golang.org/x/sys v0.29.0 // indirect
89-
golang.org/x/term v0.28.0 // indirect
90-
golang.org/x/text v0.21.0 // indirect
91-
golang.org/x/time v0.7.0 // indirect
92-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
93-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
94-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
95-
google.golang.org/grpc v1.65.1 // indirect
96-
google.golang.org/protobuf v1.36.1 // indirect
97-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
90+
go.uber.org/zap v1.27.1 // indirect
91+
go.yaml.in/yaml/v2 v2.4.3 // indirect
92+
go.yaml.in/yaml/v3 v3.0.4 // indirect
93+
golang.org/x/crypto v0.45.0 // indirect
94+
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
95+
golang.org/x/net v0.47.0 // indirect
96+
golang.org/x/oauth2 v0.33.0 // indirect
97+
golang.org/x/sync v0.18.0 // indirect
98+
golang.org/x/sys v0.38.0 // indirect
99+
golang.org/x/term v0.37.0 // indirect
100+
golang.org/x/text v0.31.0 // indirect
101+
golang.org/x/time v0.14.0 // indirect
102+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
103+
google.golang.org/genproto/googleapis/api v0.0.0-20251124214823-79d6a2a48846 // indirect
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
105+
google.golang.org/grpc v1.77.0 // indirect
106+
google.golang.org/protobuf v1.36.10 // indirect
107+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
98108
gopkg.in/fsnotify.v1 v1.4.7 // indirect
99109
gopkg.in/gcfg.v1 v1.2.3 // indirect
100110
gopkg.in/inf.v0 v0.9.1 // indirect
101111
gopkg.in/warnings.v0 v0.1.2 // indirect
102-
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/api v0.32.1 // indirect
104-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
105-
k8s.io/apimachinery v0.32.1 // indirect
106-
k8s.io/apiserver v0.32.1 // indirect
107-
k8s.io/client-go v0.32.1 // indirect
108-
k8s.io/cluster-bootstrap v0.32.1 // indirect
109-
k8s.io/component-base v0.32.1 // indirect
112+
k8s.io/api v0.34.2 // indirect
113+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
114+
k8s.io/apimachinery v0.34.2 // indirect
115+
k8s.io/apiserver v0.34.2 // indirect
116+
k8s.io/client-go v0.34.2 // indirect
117+
k8s.io/cluster-bootstrap v0.34.2 // indirect
118+
k8s.io/component-base v0.34.2 // indirect
110119
k8s.io/klog/v2 v2.130.1 // indirect
111-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
112-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
113-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
114-
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 // indirect
115-
sigs.k8s.io/controller-runtime v0.20.1 // indirect
116-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
117-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
118-
sigs.k8s.io/yaml v1.4.0 // indirect
120+
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
121+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
122+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
123+
sigs.k8s.io/controller-runtime v0.22.4 // indirect
124+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
125+
sigs.k8s.io/randfill v1.0.0 // indirect
126+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
127+
sigs.k8s.io/yaml v1.6.0 // indirect
119128
)

0 commit comments

Comments
 (0)