From 49398657375139d31f7d30a23815d23672c8c494 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 5 Nov 2025 05:48:57 +0100 Subject: [PATCH] Bump to CAPI v1.12.0-beta.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- Makefile | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- packaging/go.mod | 4 ++-- packaging/go.sum | 4 ++-- test/e2e/config/vsphere.yaml | 6 +++--- test/extension/main.go | 29 ++++++++++++++++++++++++++++- test/go.mod | 6 +++--- test/go.sum | 8 ++++---- 9 files changed, 47 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 2d4aebfd35..b471fbb93c 100644 --- a/Makefile +++ b/Makefile @@ -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)) diff --git a/go.mod b/go.mod index 16e8c86c7f..3a75aff9ed 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 diff --git a/go.sum b/go.sum index 68e70765c2..2dea40f2dc 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/packaging/go.mod b/packaging/go.mod index 6e1cbcc835..039a059feb 100644 --- a/packaging/go.mod +++ b/packaging/go.mod @@ -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 => ../ @@ -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 diff --git a/packaging/go.sum b/packaging/go.sum index 5072f8478e..b1e99d3ae0 100644 --- a/packaging/go.sum +++ b/packaging/go.sum @@ -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= diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml index 5081625070..e699e5cd47 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -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: @@ -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: @@ -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: diff --git a/test/extension/main.go b/test/extension/main.go index 0cc1206a29..e6486a302e 100644 --- a/test/extension/main.go +++ b/test/extension/main.go @@ -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{ @@ -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", @@ -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", diff --git a/test/go.mod b/test/go.mod index 89f1cc8138..7c965db9d1 100644 --- a/test/go.mod +++ b/test/go.mod @@ -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 => ../ @@ -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 diff --git a/test/go.sum b/test/go.sum index 6e8d8782ba..6decc03467 100644 --- a/test/go.sum +++ b/test/go.sum @@ -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=