Skip to content

🌱 Bump to CAPI v1.12.0-beta.0 #3662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2025
+47 −20
Merged

🌱 Bump to CAPI v1.12.0-beta.0 #3662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ IMPORT_BOSS_VER := v0.28.1
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss

CAPI_HACK_TOOLS_VER := 08b15d92faf7cede17123a4bef0d281815419dde # Note: this the commit ID of CAPI main from Oct 29th.
CAPI_HACK_TOOLS_VER := 2e7fcc61e862819988333632253b84ed2bed013b # Note: this the commit ID of CAPI v1.12.0-beta.0.

BOSKOSCTL_BIN := boskosctl
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere

go 1.24.0

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 // CAPI main from Oct 29th
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.12.0-beta.0

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

Expand Down Expand Up @@ -42,7 +42,7 @@ require (
k8s.io/component-base v0.34.1
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7
sigs.k8s.io/cluster-api v1.12.0-beta.0
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/randfill v1.0.0
sigs.k8s.io/yaml v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:pzDOvY/nmbpVjV4k7v1+j7V5PBRwTMTHmE0Ac47RxY4=
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:jQAgEtFdxteAmOb56WfuZzRqwnpzhsq0SRuookd0Ows=
sigs.k8s.io/cluster-api v1.12.0-beta.0 h1:fh6cfe3+Dc4OUK39FgGSekNqNxmX0UwumjFZvPlSAoU=
sigs.k8s.io/cluster-api v1.12.0-beta.0/go.mod h1:oMBUAS9nDbzAxpe4VuRS79Q4ujXOWuAls8nmIbj+a18=
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
Expand Down
4 changes: 2 additions & 2 deletions packaging/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere/packaging

go 1.24.0

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 // CAPI main from Oct 29th
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.12.0-beta.0

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

Expand All @@ -14,7 +14,7 @@ require (
k8s.io/apiextensions-apiserver v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7
sigs.k8s.io/cluster-api v1.12.0-beta.0
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/kustomize/api v0.18.0
Expand Down
4 changes: 2 additions & 2 deletions packaging/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:pzDOvY/nmbpVjV4k7v1+j7V5PBRwTMTHmE0Ac47RxY4=
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:jQAgEtFdxteAmOb56WfuZzRqwnpzhsq0SRuookd0Ows=
sigs.k8s.io/cluster-api v1.12.0-beta.0 h1:fh6cfe3+Dc4OUK39FgGSekNqNxmX0UwumjFZvPlSAoU=
sigs.k8s.io/cluster-api v1.12.0-beta.0/go.mod h1:oMBUAS9nDbzAxpe4VuRS79Q4ujXOWuAls8nmIbj+a18=
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/config/vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ providers:
type: CoreProvider
versions:
- name: "v1.12.99"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20251029/core-components.yaml"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.12.0-beta.0/core-components.yaml"
type: "url"
contract: v1beta2
files:
Expand Down Expand Up @@ -67,7 +67,7 @@ providers:
type: BootstrapProvider
versions:
- name: "v1.12.99"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20251029/bootstrap-components.yaml"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.12.0-beta.0/bootstrap-components.yaml"
type: "url"
contract: v1beta2
files:
Expand Down Expand Up @@ -107,7 +107,7 @@ providers:
type: ControlPlaneProvider
versions:
- name: "v1.12.99"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20251029/control-plane-components.yaml"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.12.0-beta.0/control-plane-components.yaml"
type: "url"
contract: v1beta2
files:
Expand Down
29 changes: 28 additions & 1 deletion test/extension/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ func setupTopologyMutationHookHandlers(runtimeExtensionWebhookServer *server.Ser
func setupLifecycleHookHandlers(mgr ctrl.Manager, runtimeExtensionWebhookServer *server.Server) {
// Create the ExtensionHandlers for the lifecycle hooks
// NOTE: it is not mandatory to group all the ExtensionHandlers using a struct, what is important
// is to have HandlerFunc with the signature defined in sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1.
// is to have HandlerFunc with the signature defined in sigs.k8s.io/cluster-api/api/runtime/hooks/v1alpha1.
lifecycleExtensionHandlers := lifecycle.NewExtensionHandlers(mgr.GetClient())

if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
Expand Down Expand Up @@ -351,6 +351,15 @@ func setupLifecycleHookHandlers(mgr ctrl.Manager, runtimeExtensionWebhookServer
os.Exit(1)
}

if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
Hook: runtimehooksv1.BeforeControlPlaneUpgrade,
Name: "before-control-plane-upgrade",
HandlerFunc: lifecycleExtensionHandlers.DoBeforeControlPlaneUpgrade,
}); err != nil {
setupLog.Error(err, "Error adding handler")
os.Exit(1)
}

if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
Hook: runtimehooksv1.AfterControlPlaneUpgrade,
Name: "after-control-plane-upgrade",
Expand All @@ -360,6 +369,24 @@ func setupLifecycleHookHandlers(mgr ctrl.Manager, runtimeExtensionWebhookServer
os.Exit(1)
}

if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
Hook: runtimehooksv1.BeforeWorkersUpgrade,
Name: "before-workers-upgrade",
HandlerFunc: lifecycleExtensionHandlers.DoBeforeWorkersUpgrade,
}); err != nil {
setupLog.Error(err, "Error adding handler")
os.Exit(1)
}

if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
Hook: runtimehooksv1.AfterWorkersUpgrade,
Name: "after-workers-upgrade",
HandlerFunc: lifecycleExtensionHandlers.DoAfterWorkersUpgrade,
}); err != nil {
setupLog.Error(err, "Error adding handler")
os.Exit(1)
}

if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
Hook: runtimehooksv1.AfterClusterUpgrade,
Name: "after-cluster-upgrade",
Expand Down
6 changes: 3 additions & 3 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test

go 1.24.0

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 // CAPI main from Oct 29th
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.12.0-beta.0

replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-rc.0.0.20251029133204-08b15d92faf7 // CAPI main from Oct 29th
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.12.0-beta.0.0.20251106035851-870e8a6e96c6 // commit with https://github.com/kubernetes-sigs/cluster-api/pull/12956

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

Expand Down Expand Up @@ -36,7 +36,7 @@ require (
k8s.io/component-base v0.34.1
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7
sigs.k8s.io/cluster-api v1.12.0-beta.0
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
sigs.k8s.io/controller-runtime v0.22.4
Expand Down
8 changes: 4 additions & 4 deletions test/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,10 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:pzDOvY/nmbpVjV4k7v1+j7V5PBRwTMTHmE0Ac47RxY4=
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:jQAgEtFdxteAmOb56WfuZzRqwnpzhsq0SRuookd0Ows=
sigs.k8s.io/cluster-api/test v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:PX4RMsGq3VgPimkNgE94mEcWOKcI6FbieWt1zx11MI4=
sigs.k8s.io/cluster-api/test v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:9JG8E0HbRzK4+cXi59VKgdkPRMhdRIPTgQ8kSoumJvg=
sigs.k8s.io/cluster-api v1.12.0-beta.0 h1:fh6cfe3+Dc4OUK39FgGSekNqNxmX0UwumjFZvPlSAoU=
sigs.k8s.io/cluster-api v1.12.0-beta.0/go.mod h1:oMBUAS9nDbzAxpe4VuRS79Q4ujXOWuAls8nmIbj+a18=
sigs.k8s.io/cluster-api/test v1.12.0-beta.0.0.20251106035851-870e8a6e96c6 h1:QvFrEq7EmIygpQPeiI+pfxm5NVfVwcV3w257p5D0f9Y=
sigs.k8s.io/cluster-api/test v1.12.0-beta.0.0.20251106035851-870e8a6e96c6/go.mod h1:bvy4wu7DLUKEs+/njjMdNJG6xvJSQfbjhqUKgKR/R2g=
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
Expand Down