Skip to content

Commit 3066ca2

Browse files
authored
Merge pull request #3662 from sbueringer/pr-bump-v1.12.0-beta.0
🌱 Bump to CAPI v1.12.0-beta.0
2 parents d6833ff + 4939865 commit 3066ca2

File tree

9 files changed

+47
-20
lines changed

9 files changed

+47
-20
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 := 08b15d92faf7cede17123a4bef0d281815419dde # Note: this the commit ID of CAPI main from Oct 29th.
197+
CAPI_HACK_TOOLS_VER := 2e7fcc61e862819988333632253b84ed2bed013b # Note: this the commit ID of CAPI v1.12.0-beta.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-rc.0.0.20251029133204-08b15d92faf7 // CAPI main from Oct 29th
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.12.0-beta.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

@@ -42,7 +42,7 @@ require (
4242
k8s.io/component-base v0.34.1
4343
k8s.io/klog/v2 v2.130.1
4444
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
45-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7
45+
sigs.k8s.io/cluster-api v1.12.0-beta.0
4646
sigs.k8s.io/controller-runtime v0.22.4
4747
sigs.k8s.io/randfill v1.0.0
4848
sigs.k8s.io/yaml v1.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
401401
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
402402
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
403403
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
404-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:pzDOvY/nmbpVjV4k7v1+j7V5PBRwTMTHmE0Ac47RxY4=
405-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:jQAgEtFdxteAmOb56WfuZzRqwnpzhsq0SRuookd0Ows=
404+
sigs.k8s.io/cluster-api v1.12.0-beta.0 h1:fh6cfe3+Dc4OUK39FgGSekNqNxmX0UwumjFZvPlSAoU=
405+
sigs.k8s.io/cluster-api v1.12.0-beta.0/go.mod h1:oMBUAS9nDbzAxpe4VuRS79Q4ujXOWuAls8nmIbj+a18=
406406
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
407407
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
408408
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

packaging/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/packaging
22

33
go 1.24.0
44

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

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

@@ -14,7 +14,7 @@ require (
1414
k8s.io/apiextensions-apiserver v0.34.1
1515
k8s.io/apimachinery v0.34.1
1616
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
17-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7
17+
sigs.k8s.io/cluster-api v1.12.0-beta.0
1818
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
1919
sigs.k8s.io/controller-runtime v0.22.4
2020
sigs.k8s.io/kustomize/api v0.18.0

packaging/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
242242
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
243243
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
244244
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
245-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:pzDOvY/nmbpVjV4k7v1+j7V5PBRwTMTHmE0Ac47RxY4=
246-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:jQAgEtFdxteAmOb56WfuZzRqwnpzhsq0SRuookd0Ows=
245+
sigs.k8s.io/cluster-api v1.12.0-beta.0 h1:fh6cfe3+Dc4OUK39FgGSekNqNxmX0UwumjFZvPlSAoU=
246+
sigs.k8s.io/cluster-api v1.12.0-beta.0/go.mod h1:oMBUAS9nDbzAxpe4VuRS79Q4ujXOWuAls8nmIbj+a18=
247247
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
248248
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
249249
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

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.12.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20251029/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.12.0-beta.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.12.99"
70-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20251029/bootstrap-components.yaml"
70+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.12.0-beta.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.12.99"
110-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20251029/control-plane-components.yaml"
110+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.12.0-beta.0/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta2
113113
files:

test/extension/main.go

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func setupTopologyMutationHookHandlers(runtimeExtensionWebhookServer *server.Ser
321321
func setupLifecycleHookHandlers(mgr ctrl.Manager, runtimeExtensionWebhookServer *server.Server) {
322322
// Create the ExtensionHandlers for the lifecycle hooks
323323
// NOTE: it is not mandatory to group all the ExtensionHandlers using a struct, what is important
324-
// is to have HandlerFunc with the signature defined in sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1.
324+
// is to have HandlerFunc with the signature defined in sigs.k8s.io/cluster-api/api/runtime/hooks/v1alpha1.
325325
lifecycleExtensionHandlers := lifecycle.NewExtensionHandlers(mgr.GetClient())
326326

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

354+
if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
355+
Hook: runtimehooksv1.BeforeControlPlaneUpgrade,
356+
Name: "before-control-plane-upgrade",
357+
HandlerFunc: lifecycleExtensionHandlers.DoBeforeControlPlaneUpgrade,
358+
}); err != nil {
359+
setupLog.Error(err, "Error adding handler")
360+
os.Exit(1)
361+
}
362+
354363
if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
355364
Hook: runtimehooksv1.AfterControlPlaneUpgrade,
356365
Name: "after-control-plane-upgrade",
@@ -360,6 +369,24 @@ func setupLifecycleHookHandlers(mgr ctrl.Manager, runtimeExtensionWebhookServer
360369
os.Exit(1)
361370
}
362371

372+
if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
373+
Hook: runtimehooksv1.BeforeWorkersUpgrade,
374+
Name: "before-workers-upgrade",
375+
HandlerFunc: lifecycleExtensionHandlers.DoBeforeWorkersUpgrade,
376+
}); err != nil {
377+
setupLog.Error(err, "Error adding handler")
378+
os.Exit(1)
379+
}
380+
381+
if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
382+
Hook: runtimehooksv1.AfterWorkersUpgrade,
383+
Name: "after-workers-upgrade",
384+
HandlerFunc: lifecycleExtensionHandlers.DoAfterWorkersUpgrade,
385+
}); err != nil {
386+
setupLog.Error(err, "Error adding handler")
387+
os.Exit(1)
388+
}
389+
363390
if err := runtimeExtensionWebhookServer.AddExtensionHandler(server.ExtensionHandler{
364391
Hook: runtimehooksv1.AfterClusterUpgrade,
365392
Name: "after-cluster-upgrade",

test/go.mod

Lines changed: 3 additions & 3 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-rc.0.0.20251029133204-08b15d92faf7 // CAPI main from Oct 29th
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.12.0-beta.0
66

7-
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
7+
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
88

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

@@ -36,7 +36,7 @@ require (
3636
k8s.io/component-base v0.34.1
3737
k8s.io/klog/v2 v2.130.1
3838
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
39-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7
39+
sigs.k8s.io/cluster-api v1.12.0-beta.0
4040
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
4141
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
4242
sigs.k8s.io/controller-runtime v0.22.4

test/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,10 +553,10 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
553553
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
554554
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
555555
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
556-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:pzDOvY/nmbpVjV4k7v1+j7V5PBRwTMTHmE0Ac47RxY4=
557-
sigs.k8s.io/cluster-api v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:jQAgEtFdxteAmOb56WfuZzRqwnpzhsq0SRuookd0Ows=
558-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0.0.20251029133204-08b15d92faf7 h1:PX4RMsGq3VgPimkNgE94mEcWOKcI6FbieWt1zx11MI4=
559-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0.0.20251029133204-08b15d92faf7/go.mod h1:9JG8E0HbRzK4+cXi59VKgdkPRMhdRIPTgQ8kSoumJvg=
556+
sigs.k8s.io/cluster-api v1.12.0-beta.0 h1:fh6cfe3+Dc4OUK39FgGSekNqNxmX0UwumjFZvPlSAoU=
557+
sigs.k8s.io/cluster-api v1.12.0-beta.0/go.mod h1:oMBUAS9nDbzAxpe4VuRS79Q4ujXOWuAls8nmIbj+a18=
558+
sigs.k8s.io/cluster-api/test v1.12.0-beta.0.0.20251106035851-870e8a6e96c6 h1:QvFrEq7EmIygpQPeiI+pfxm5NVfVwcV3w257p5D0f9Y=
559+
sigs.k8s.io/cluster-api/test v1.12.0-beta.0.0.20251106035851-870e8a6e96c6/go.mod h1:bvy4wu7DLUKEs+/njjMdNJG6xvJSQfbjhqUKgKR/R2g=
560560
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
561561
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
562562
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

0 commit comments

Comments
 (0)