Skip to content

Commit bde78b1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2652 from Nordix/lentzi90/capi-rc
🌱 Bump CAPI to v1.11.0-rc.0
2 parents 388a5d3 + 325e4dc commit bde78b1

File tree

9 files changed

+35
-70
lines changed

9 files changed

+35
-70
lines changed

‎cmd/models-schema/zz_generated.openapi.go‎

Lines changed: 12 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/openstackfloatingippool_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (r *OpenStackFloatingIPPoolReconciler) Reconcile(ctx context.Context, req c
171171
Name: pool.Name,
172172
},
173173
Address: ip,
174-
Prefix: 32,
174+
Prefix: ptr.To(int32(32)),
175175
},
176176
}
177177

‎controllers/openstackmachine_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ func (r *OpenStackMachineReconciler) reconcileMachineState(scope *scope.WithLogg
440440
// so the error could be something temporary.
441441
// If not, it is more likely a configuration error so we set failure and never retry.
442442
scope.Logger().Info("Machine instance state is ERROR", "id", openStackServer.Status.InstanceID)
443-
if machine.Status.NodeRef == nil {
443+
if !machine.Status.NodeRef.IsDefined() {
444444
err := fmt.Errorf("instance state %v is unexpected", openStackServer.Status.InstanceState)
445445
openStackMachine.SetFailure(capoerrors.DeprecatedCAPIUpdateMachineError, err)
446446
}

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ require (
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
3131
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32-
sigs.k8s.io/cluster-api v1.11.0-beta.2
33-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2
32+
sigs.k8s.io/cluster-api v1.11.0-rc.0
33+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0
3434
sigs.k8s.io/controller-runtime v0.21.0
3535
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
3636
sigs.k8s.io/yaml v1.6.0
@@ -140,7 +140,7 @@ require (
140140
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
141141
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
142142
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
143-
google.golang.org/grpc v1.71.1 // indirect
143+
google.golang.org/grpc v1.71.3 // indirect
144144
google.golang.org/protobuf v1.36.6 // indirect
145145
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
146146
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:
370370
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
371371
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
372372
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
373-
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
374-
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
373+
google.golang.org/grpc v1.71.3 h1:iEhneYTxOruJyZAxdAv8Y0iRZvsc5M6KoW7UA0/7jn0=
374+
google.golang.org/grpc v1.71.3/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
375375
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
376376
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
377377
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -414,10 +414,10 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
414414
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
415415
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
416416
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
417-
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
418-
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
419-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2 h1:v7BvUmmMhTNXYqF9vgVZ7BGohG0SwETWdd8NQzlwDgQ=
420-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2/go.mod h1:d8LxG8eS4bIvd5hR5jA8x1DmiUTlC1f0mncGCT0q1Ao=
417+
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
418+
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
419+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0 h1:PulJADupD3qF2F4Rwdt+OcH0YSrRgTTGYYgU/Pwu5gM=
420+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
421421
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
422422
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
423423
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎hack/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ require (
154154
k8s.io/release v0.16.9 // indirect
155155
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
156156
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
157-
sigs.k8s.io/cluster-api v1.11.0-beta.2 // indirect
157+
sigs.k8s.io/cluster-api v1.11.0-rc.0 // indirect
158158
sigs.k8s.io/controller-runtime v0.21.0 // indirect
159159
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
160160
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect

‎hack/tools/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,12 +480,12 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
480480
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
481481
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
482482
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
483-
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
484-
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
483+
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
484+
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
485485
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250805173327-a7b9f27af519 h1:WkOO6Fg3tmbuFXqTMFfs80mapaQyBbdIC5p86LIVlBI=
486486
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250805173327-a7b9f27af519/go.mod h1:/Zjkh19AmjuI4piKJ1fAZW7k0cDZsSoAAcGHKGZJTZU=
487-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2 h1:v7BvUmmMhTNXYqF9vgVZ7BGohG0SwETWdd8NQzlwDgQ=
488-
sigs.k8s.io/cluster-api/test v1.11.0-beta.2/go.mod h1:d8LxG8eS4bIvd5hR5jA8x1DmiUTlC1f0mncGCT0q1Ao=
487+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0 h1:PulJADupD3qF2F4Rwdt+OcH0YSrRgTTGYYgU/Pwu5gM=
488+
sigs.k8s.io/cluster-api/test v1.11.0-rc.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
489489
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
490490
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
491491
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250620151452-b9a9ca01fd37 h1:NSnbH7C6/fYc5L3FxMQiSlFBqYi+32LnFsXwArzOlIM=

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ providers:
1818
type: CoreProvider
1919
versions:
2020
- name: "v1.11.99"
21-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-beta.2/core-components.yaml"
21+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.0/core-components.yaml"
2222
type: "url"
2323
contract: v1beta2
2424
replacements:
@@ -53,7 +53,7 @@ providers:
5353
type: BootstrapProvider
5454
versions:
5555
- name: "v1.11.99"
56-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-beta.2/bootstrap-components.yaml"
56+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.0/bootstrap-components.yaml"
5757
type: "url"
5858
contract: v1beta2
5959
replacements:
@@ -88,7 +88,7 @@ providers:
8888
type: ControlPlaneProvider
8989
versions:
9090
- name: "v1.11.99"
91-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-beta.2/control-plane-components.yaml"
91+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.0/control-plane-components.yaml"
9292
type: "url"
9393
contract: v1beta2
9494
replacements:

‎test/e2e/suites/e2e/e2e_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,17 +1284,17 @@ func makeJoinBootstrapConfigTemplate(namespace, name string) *bootstrapv1.Kubead
12841284
Spec: bootstrapv1.KubeadmConfigTemplateSpec{
12851285
Template: bootstrapv1.KubeadmConfigTemplateResource{
12861286
Spec: bootstrapv1.KubeadmConfigSpec{
1287-
JoinConfiguration: &bootstrapv1.JoinConfiguration{
1287+
JoinConfiguration: bootstrapv1.JoinConfiguration{
12881288
NodeRegistration: bootstrapv1.NodeRegistrationOptions{
12891289
Name: "{{ local_hostname }}",
12901290
KubeletExtraArgs: []bootstrapv1.Arg{
12911291
{
12921292
Name: "cloud-provider",
1293-
Value: "openstack",
1293+
Value: ptr.To("openstack"),
12941294
},
12951295
{
12961296
Name: "cloud-config",
1297-
Value: "/etc/kubernetes/cloud.conf",
1297+
Value: ptr.To("/etc/kubernetes/cloud.conf"),
12981298
},
12991299
},
13001300
},
@@ -1338,7 +1338,7 @@ func makeMachineDeployment(namespace, mdName, clusterName string, failureDomain
13381338
ClusterName: clusterName,
13391339
FailureDomain: failureDomain,
13401340
Bootstrap: clusterv1.Bootstrap{
1341-
ConfigRef: &clusterv1.ContractVersionedObjectReference{
1341+
ConfigRef: clusterv1.ContractVersionedObjectReference{
13421342
Kind: "KubeadmConfigTemplate",
13431343
APIGroup: bootstrapv1.GroupVersion.Group,
13441344
Name: mdName,

0 commit comments

Comments
 (0)