Skip to content

Commit e2fdd87

Browse files
authored
Merge pull request #3548 from sbueringer/pr-bump-capi-v1.11.0-beta.1
✨ Bump to CAPI v1.11.0-beta.1
2 parents 3eaa3f0 + 37f31c1 commit e2fdd87

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
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 := f330cf22da5e0f0f3ff4d4fef14856d4512d796e # Note: this the commit ID for CAPI main 2025.07.18.
193+
CAPI_HACK_TOOLS_VER := fb0e2da320e26237acb28cc4e835759b67badc91 # Note: this the commit ID of CAPI v1.11.0-beta.1.
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-beta.0.0.20250718131826-f330cf22da5e
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.1
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
@@ -381,8 +381,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
381381
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
382382
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
383383
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
384-
sigs.k8s.io/cluster-api v1.11.0-beta.0.0.20250718131826-f330cf22da5e h1:+hBsJ6q1DlTn7l7Scfa5YsjZI+mq9QpQw/7zDA3GxLA=
385-
sigs.k8s.io/cluster-api v1.11.0-beta.0.0.20250718131826-f330cf22da5e/go.mod h1:GJoz9vNDDp7jH4fM9E5glu3zc0INdlL69nYBaYu3bt4=
384+
sigs.k8s.io/cluster-api v1.11.0-beta.1 h1:VCWlF5VHzVPPDEbzVRhB4hdBq6B9t5U8xgv5f1ltz+s=
385+
sigs.k8s.io/cluster-api v1.11.0-beta.1/go.mod h1:M02o/JTUKq52NKyLsjz2HHGa6BtUbXzyu+pzOk9SfeI=
386386
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
387387
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
388388
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.0.0.20250718131826-f330cf22da5e
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.1
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.0.0.20250718131826-f330cf22da5e h1:+hBsJ6q1DlTn7l7Scfa5YsjZI+mq9QpQw/7zDA3GxLA=
245-
sigs.k8s.io/cluster-api v1.11.0-beta.0.0.20250718131826-f330cf22da5e/go.mod h1:GJoz9vNDDp7jH4fM9E5glu3zc0INdlL69nYBaYu3bt4=
244+
sigs.k8s.io/cluster-api v1.11.0-beta.1 h1:VCWlF5VHzVPPDEbzVRhB4hdBq6B9t5U8xgv5f1ltz+s=
245+
sigs.k8s.io/cluster-api v1.11.0-beta.1/go.mod h1:M02o/JTUKq52NKyLsjz2HHGa6BtUbXzyu+pzOk9SfeI=
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/nightly_main_20250718/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.1/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_20250718/bootstrap-components.yaml"
70+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.1/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_20250718/control-plane-components.yaml"
110+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.1/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta2
113113
files:

test/go.mod

Lines changed: 2 additions & 2 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.0.0.20250718131826-f330cf22da5e
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.1
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-beta.0.0.20250718131826-f330cf22da5e
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-beta.1
88

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

test/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
532532
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
533533
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
534534
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
535-
sigs.k8s.io/cluster-api v1.11.0-beta.0.0.20250718131826-f330cf22da5e h1:+hBsJ6q1DlTn7l7Scfa5YsjZI+mq9QpQw/7zDA3GxLA=
536-
sigs.k8s.io/cluster-api v1.11.0-beta.0.0.20250718131826-f330cf22da5e/go.mod h1:GJoz9vNDDp7jH4fM9E5glu3zc0INdlL69nYBaYu3bt4=
537-
sigs.k8s.io/cluster-api/test v1.11.0-beta.0.0.20250718131826-f330cf22da5e h1:dzsV20ST03uwmtL1Rv4bMeTfH2mEqk+Utg5Gnr8c8Yc=
538-
sigs.k8s.io/cluster-api/test v1.11.0-beta.0.0.20250718131826-f330cf22da5e/go.mod h1:t29v+e2bUdVcgSj5rOx9ScixxHx821tZZ7xy40n3HHI=
535+
sigs.k8s.io/cluster-api v1.11.0-beta.1 h1:VCWlF5VHzVPPDEbzVRhB4hdBq6B9t5U8xgv5f1ltz+s=
536+
sigs.k8s.io/cluster-api v1.11.0-beta.1/go.mod h1:M02o/JTUKq52NKyLsjz2HHGa6BtUbXzyu+pzOk9SfeI=
537+
sigs.k8s.io/cluster-api/test v1.11.0-beta.1 h1:FRMINuzULqMS5Ei1t6lj3DTPliRKQkFn+IXl9S6gp30=
538+
sigs.k8s.io/cluster-api/test v1.11.0-beta.1/go.mod h1:2AKYX7iSxcqeE4iSB2/h7PPrr9vop3X8X4Tc9NTxTJ8=
539539
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
540540
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
541541
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

0 commit comments

Comments
 (0)