Skip to content

Commit 69db4aa

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3534 from sbueringer/pr-bump-capi-alpha.2
🌱 Bump to CAPI v1.11.0-alpha.2
2 parents 18aaaa9 + c3e8d8d commit 69db4aa

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎Makefile

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

193-
CAPI_HACK_TOOLS_VER := 4852b676b3ff1adfcd9aa946d4bba883f0339a00 # Note: this the commit ID for CAPI v1.11.0-alpha.1.0.20250624163428-4852b676b3ff
193+
CAPI_HACK_TOOLS_VER := 890d16f24287718d96252affa702ff5857114079 # Note: this the commit ID for CAPI v1.11.0-alpha.2
194194

195195
BOSKOSCTL_BIN := boskosctl
196196
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎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
22

33
go 1.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.2
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

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
380380
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
381381
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
382382
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
383-
sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff h1:P3MCrNBqRkeUP88ltOt0+FhmyJtCrNfYgsAiqrvmHV4=
384-
sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff/go.mod h1:ZSXsSe4gbkdXb93KlA94JRl7YmSniekbhePSIWSIUiY=
383+
sigs.k8s.io/cluster-api v1.11.0-alpha.2 h1:MRj1bsx8X1fYlbl5NCf+98XJ+oIuxRVppXD0KIgjddw=
384+
sigs.k8s.io/cluster-api v1.11.0-alpha.2/go.mod h1:AougDuRB0zXAygnmSTEJiQ1f/s382U2DfboFHbaK1VQ=
385385
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
386386
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
387387
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-alpha.1.0.20250624163428-4852b676b3ff
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.2
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
@@ -239,8 +239,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
239239
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
240240
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
241241
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
242-
sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff h1:P3MCrNBqRkeUP88ltOt0+FhmyJtCrNfYgsAiqrvmHV4=
243-
sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff/go.mod h1:ZSXsSe4gbkdXb93KlA94JRl7YmSniekbhePSIWSIUiY=
242+
sigs.k8s.io/cluster-api v1.11.0-alpha.2 h1:MRj1bsx8X1fYlbl5NCf+98XJ+oIuxRVppXD0KIgjddw=
243+
sigs.k8s.io/cluster-api v1.11.0-alpha.2/go.mod h1:AougDuRB0zXAygnmSTEJiQ1f/s382U2DfboFHbaK1VQ=
244244
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
245245
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
246246
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/nightly_main_20250624/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-alpha.2/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/nightly_main_20250624/bootstrap-components.yaml"
70+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-alpha.2/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/nightly_main_20250624/control-plane-components.yaml"
110+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-alpha.2/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-alpha.1.0.20250624163428-4852b676b3ff
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.2
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-alpha.1.0.20250624163428-4852b676b3ff
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-alpha.2
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.2.2+incompatible // indirect
64+
github.com/docker/docker v28.3.0+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
@@ -78,7 +78,7 @@ require (
7878
github.com/go-openapi/jsonreference v0.20.2 // indirect
7979
github.com/go-openapi/swag v0.23.0 // indirect
8080
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
81-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
81+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
8282
github.com/gobuffalo/flect v1.0.3 // indirect
8383
github.com/gogo/protobuf v1.3.2 // indirect
8484
github.com/golang/protobuf v1.5.4 // 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.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
72-
github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
71+
github.com/docker/docker v28.3.0+incompatible h1:ffS62aKWupCWdvcee7nBU9fhnmknOqDPaJAMtfK0ImQ=
72+
github.com/docker/docker v28.3.0+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=
@@ -124,8 +124,8 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+Gr
124124
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
125125
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
126126
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
127-
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
128-
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
127+
github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
128+
github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
129129
github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4=
130130
github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
131131
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -531,10 +531,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
531531
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
532532
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
533533
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
534-
sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff h1:P3MCrNBqRkeUP88ltOt0+FhmyJtCrNfYgsAiqrvmHV4=
535-
sigs.k8s.io/cluster-api v1.11.0-alpha.1.0.20250624163428-4852b676b3ff/go.mod h1:ZSXsSe4gbkdXb93KlA94JRl7YmSniekbhePSIWSIUiY=
536-
sigs.k8s.io/cluster-api/test v1.11.0-alpha.1.0.20250624163428-4852b676b3ff h1:j6i0uSNhOqlnkNYxOQPjqptVAseQ8XdoAfgMNdNsXlo=
537-
sigs.k8s.io/cluster-api/test v1.11.0-alpha.1.0.20250624163428-4852b676b3ff/go.mod h1:RnKvHwfw5IyoVwZlGYIULrcdpiipOwM6Z2cfiTBRxvw=
534+
sigs.k8s.io/cluster-api v1.11.0-alpha.2 h1:MRj1bsx8X1fYlbl5NCf+98XJ+oIuxRVppXD0KIgjddw=
535+
sigs.k8s.io/cluster-api v1.11.0-alpha.2/go.mod h1:AougDuRB0zXAygnmSTEJiQ1f/s382U2DfboFHbaK1VQ=
536+
sigs.k8s.io/cluster-api/test v1.11.0-alpha.2 h1:YpwxLih6eEgQuzssvqwr5osCbW82MP6CXZhK5Ir8rFU=
537+
sigs.k8s.io/cluster-api/test v1.11.0-alpha.2/go.mod h1:SXsD8F6ldPfVyDZDjP/syHBsMT85800Y2gYjnmyUXhU=
538538
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
539539
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
540540
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

0 commit comments

Comments
 (0)