Skip to content

Commit d5fc2e3

Browse files
sbueringersbueringer
committed
Bump CAPI to v1.9.0-rc.0.0.20250303134942-c9261b079e0b
1 parent 62e2b32 commit d5fc2e3

File tree

7 files changed

+44
-42
lines changed

7 files changed

+44
-42
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b
66

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

@@ -75,7 +75,7 @@ require (
7575
go.uber.org/multierr v1.11.0 // indirect
7676
go.uber.org/zap v1.27.0 // indirect
7777
golang.org/x/net v0.35.0 // indirect
78-
golang.org/x/oauth2 v0.26.0 // indirect
78+
golang.org/x/oauth2 v0.27.0 // indirect
7979
golang.org/x/sync v0.11.0 // indirect
8080
golang.org/x/sys v0.30.0 // indirect
8181
golang.org/x/term v0.29.0 // indirect
@@ -103,7 +103,7 @@ require (
103103
github.com/gogo/protobuf v1.3.2 // indirect
104104
github.com/golang/protobuf v1.5.4 // indirect
105105
github.com/google/cel-go v0.22.0 // indirect
106-
github.com/google/go-cmp v0.6.0 // indirect
106+
github.com/google/go-cmp v0.7.0 // indirect
107107
github.com/inconshreveable/mousetrap v1.1.0 // indirect
108108
github.com/josharian/intern v1.0.0 // indirect
109109
github.com/json-iterator/go v1.1.12 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvR
112112
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
113113
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
114114
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
115-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
116-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
115+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
116+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
117117
github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
118118
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
119119
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
@@ -315,8 +315,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
315315
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
316316
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
317317
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
318-
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
319-
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
318+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
319+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
320320
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
321321
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
322322
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -417,8 +417,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
417417
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
418418
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
419419
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
420-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3 h1:oZh7dhqQxRnFLl4ayS8WsRAfpTNCfDWY6d9sbfe/dL0=
421-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3/go.mod h1:9UtSb2Ni0j/H5tHZxXGr3/mHPkkIPc95OkShJ2iwmnw=
420+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b h1:+rhO9yCAZLulzGOr9x3ij5XfqQj+sllwsoHptvrmwZU=
421+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b/go.mod h1:a7W/Y3PsWAoiCnL+P4+ClErZA/TIfSCHw7RNV60Dob8=
422422
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
423423
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
424424
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎packaging/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere/packaging
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b
66

77
replace sigs.k8s.io/cluster-api-provider-vsphere => ../
88

@@ -42,7 +42,7 @@ require (
4242
github.com/golang/protobuf v1.5.4 // indirect
4343
github.com/google/btree v1.1.3 // indirect
4444
github.com/google/gnostic-models v0.6.8 // indirect
45-
github.com/google/go-cmp v0.6.0 // indirect
45+
github.com/google/go-cmp v0.7.0 // indirect
4646
github.com/google/gofuzz v1.2.0 // indirect
4747
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4848
github.com/google/uuid v1.6.0 // indirect
@@ -64,7 +64,7 @@ require (
6464
go.opentelemetry.io/otel v1.28.0 // indirect
6565
go.opentelemetry.io/otel/trace v1.28.0 // indirect
6666
golang.org/x/net v0.35.0 // indirect
67-
golang.org/x/oauth2 v0.26.0 // indirect
67+
golang.org/x/oauth2 v0.27.0 // indirect
6868
golang.org/x/sync v0.11.0 // indirect
6969
golang.org/x/sys v0.30.0 // indirect
7070
golang.org/x/term v0.29.0 // indirect

‎packaging/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76
5151
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
5252
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
5353
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
54-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
55-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
54+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
55+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
5656
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
5757
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
5858
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -163,8 +163,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
163163
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
164164
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
165165
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
166-
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
167-
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
166+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
167+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
168168
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
169169
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
170170
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -231,8 +231,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
231231
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
232232
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
233233
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
234-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3 h1:oZh7dhqQxRnFLl4ayS8WsRAfpTNCfDWY6d9sbfe/dL0=
235-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3/go.mod h1:9UtSb2Ni0j/H5tHZxXGr3/mHPkkIPc95OkShJ2iwmnw=
234+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b h1:+rhO9yCAZLulzGOr9x3ij5XfqQj+sllwsoHptvrmwZU=
235+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b/go.mod h1:a7W/Y3PsWAoiCnL+P4+ClErZA/TIfSCHw7RNV60Dob8=
236236
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
237237
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
238238
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎test/e2e/config/vsphere.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ providers:
2727
type: CoreProvider
2828
versions:
2929
- name: "v1.10.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250216/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250302/core-components.yaml"
3131
type: "url"
3232
contract: v1beta1
3333
files:
@@ -76,7 +76,7 @@ providers:
7676
type: BootstrapProvider
7777
versions:
7878
- name: "v1.10.99"
79-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250216/bootstrap-components.yaml"
79+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250302/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -125,7 +125,7 @@ providers:
125125
type: ControlPlaneProvider
126126
versions:
127127
- name: "v1.10.99"
128-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250216/control-plane-components.yaml"
128+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250302/control-plane-components.yaml"
129129
type: "url"
130130
contract: v1beta1
131131
files:

‎test/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250303134942-c9261b079e0b
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.9.0-rc.0.0.20250214165422-065f159469f3
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.9.0-rc.0.0.20250303134942-c9261b079e0b
88

99
replace sigs.k8s.io/cluster-api-provider-vsphere => ../
1010

@@ -41,6 +41,7 @@ require (
4141
)
4242

4343
require (
44+
al.essio.dev/pkg/shellescape v1.5.1 // indirect
4445
cel.dev/expr v0.18.0 // indirect
4546
dario.cat/mergo v1.0.1 // indirect
4647
github.com/BurntSushi/toml v1.4.0 // indirect
@@ -52,7 +53,6 @@ require (
5253
github.com/NYTimes/gziphandler v1.1.1 // indirect
5354
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
5455
github.com/adrg/xdg v0.5.3 // indirect
55-
github.com/alessio/shellescape v1.4.2 // indirect
5656
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5757
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5858
github.com/beorn7/perks v1.0.1 // indirect
@@ -64,7 +64,7 @@ require (
6464
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6565
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6666
github.com/distribution/reference v0.6.0 // indirect
67-
github.com/docker/docker v27.5.1+incompatible // indirect
67+
github.com/docker/docker v28.0.0+incompatible // indirect
6868
github.com/docker/go-connections v0.5.0 // indirect
6969
github.com/docker/go-units v0.4.0 // indirect
7070
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -86,7 +86,7 @@ require (
8686
github.com/google/btree v1.1.3 // indirect
8787
github.com/google/cel-go v0.22.0 // indirect
8888
github.com/google/gnostic-models v0.6.8 // indirect
89-
github.com/google/go-cmp v0.6.0 // indirect
89+
github.com/google/go-cmp v0.7.0 // indirect
9090
github.com/google/go-github/v53 v53.2.0 // indirect
9191
github.com/google/go-querystring v1.1.0 // indirect
9292
github.com/google/gofuzz v1.2.0 // indirect
@@ -151,7 +151,7 @@ require (
151151
go.uber.org/zap v1.27.0 // indirect
152152
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
153153
golang.org/x/net v0.35.0 // indirect
154-
golang.org/x/oauth2 v0.26.0 // indirect
154+
golang.org/x/oauth2 v0.27.0 // indirect
155155
golang.org/x/sync v0.11.0 // indirect
156156
golang.org/x/sys v0.30.0 // indirect
157157
golang.org/x/term v0.29.0 // indirect
@@ -172,6 +172,6 @@ require (
172172
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
173173
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
174174
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
175-
sigs.k8s.io/kind v0.26.0 // indirect
175+
sigs.k8s.io/kind v0.27.0 // indirect
176176
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
177177
)

0 commit comments

Comments
 (0)