Skip to content

Commit 342c5b0

Browse files
sbueringersbueringer
committed
Bump CAPI to RC.0
1 parent c5fec1d commit 342c5b0

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ IMPORT_BOSS_VER := v0.28.1
194194
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
195195
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
196196

197-
CAPI_HACK_TOOLS_VER := ead3737e81eff878355a31e8aea6416ecdc0598c # Note: this the commit ID of CAPI v1.11.0-beta.2.
197+
CAPI_HACK_TOOLS_VER := 1aab5f5381716d5453f06247aaddff05e5ae8c5f # Note: this the commit ID of CAPI v1.11.0-rc.0.
198198

199199
BOSKOSCTL_BIN := boskosctl
200200
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎go.mod

Lines changed: 2 additions & 2 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.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.2
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-rc.0
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

@@ -85,7 +85,7 @@ require (
8585
golang.org/x/text v0.27.0 // indirect
8686
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
8787
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
88-
google.golang.org/grpc v1.71.1 // indirect
88+
google.golang.org/grpc v1.71.3 // indirect
8989
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9090
gopkg.in/warnings.v0 v0.1.2 // indirect
9191
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:
329329
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
330330
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
331331
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
332-
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
333-
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
332+
google.golang.org/grpc v1.71.3 h1:iEhneYTxOruJyZAxdAv8Y0iRZvsc5M6KoW7UA0/7jn0=
333+
google.golang.org/grpc v1.71.3/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
334334
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
335335
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
336336
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -383,8 +383,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
383383
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
384384
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
385385
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
386-
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
387-
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
386+
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
387+
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
388388
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
389389
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
390390
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎packaging/go.mod

Lines changed: 1 addition & 1 deletion
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.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.2
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-rc.0
66

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

‎packaging/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+p
241241
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
242242
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
243243
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
244-
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
245-
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
244+
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
245+
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
246246
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
247247
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
248248
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.11.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.2/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-rc.0/core-components.yaml"
3131
type: "url"
3232
contract: v1beta2
3333
files:
@@ -67,7 +67,7 @@ providers:
6767
type: BootstrapProvider
6868
versions:
6969
- name: "v1.11.99"
70-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.2/bootstrap-components.yaml"
70+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-rc.0/bootstrap-components.yaml"
7171
type: "url"
7272
contract: v1beta2
7373
files:
@@ -107,7 +107,7 @@ providers:
107107
type: ControlPlaneProvider
108108
versions:
109109
- name: "v1.11.99"
110-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.2/control-plane-components.yaml"
110+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-rc.0/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta2
113113
files:

‎test/go.mod

Lines changed: 4 additions & 4 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.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.2
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-rc.0
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-beta.2
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-rc.0
88

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

@@ -61,7 +61,7 @@ require (
6161
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6262
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6363
github.com/distribution/reference v0.6.0 // indirect
64-
github.com/docker/docker v28.3.2+incompatible // indirect
64+
github.com/docker/docker v28.3.3+incompatible // indirect
6565
github.com/docker/go-connections v0.5.0 // indirect
6666
github.com/docker/go-units v0.4.0 // indirect
6767
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -160,7 +160,7 @@ require (
160160
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
161161
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
162162
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
163-
google.golang.org/grpc v1.71.1 // indirect
163+
google.golang.org/grpc v1.71.3 // indirect
164164
google.golang.org/protobuf v1.36.6 // indirect
165165
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
166166
gopkg.in/inf.v0 v0.9.1 // indirect

‎test/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
6868
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6969
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
7070
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
71-
github.com/docker/docker v28.3.2+incompatible h1:wn66NJ6pWB1vBZIilP8G3qQPqHy5XymfYn5vsqeA5oA=
72-
github.com/docker/docker v28.3.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
71+
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
72+
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
7373
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
7474
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
7575
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -476,8 +476,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:
476476
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
477477
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
478478
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
479-
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
480-
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
479+
google.golang.org/grpc v1.71.3 h1:iEhneYTxOruJyZAxdAv8Y0iRZvsc5M6KoW7UA0/7jn0=
480+
google.golang.org/grpc v1.71.3/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
481481
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
482482
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
483483
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -534,10 +534,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
534534
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
535535
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
536536
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
537-
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
538-
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
539-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2 h1:v7BvUmmMhTNXYqF9vgVZ7BGohG0SwETWdd8NQzlwDgQ=
540-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2/go.mod h1:d8LxG8eS4bIvd5hR5jA8x1DmiUTlC1f0mncGCT0q1Ao=
537+
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
538+
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
539+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0 h1:PulJADupD3qF2F4Rwdt+OcH0YSrRgTTGYYgU/Pwu5gM=
540+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
541541
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
542542
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
543543
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

0 commit comments

Comments
 (0)