:warning: Group API server fields under spec.apiServer by nikParasyr · Pull Request #3169 · kubernetes-sigs/cluster-api-provider-openstack

nikParasyr · 2026-05-18T07:52:50Z

What this PR does / why we need it:
Consolidate the various flat API server fields (apiServerFloatingIP, apiServerFixedIP, apiServerPort, disableAPIServerFloatingIP, and apiServerLoadBalancer) into a single structured spec.apiServer object, with apiServerLoadBalancer renamed to managedLoadBalancer within it. Includes conversion from v1beta1 and updated webhook validation.

Which issue(s) this PR fixes :
Fixes #2899

Special notes for your reviewer:

~~Not sure whether OSC.status should be updated as well to reflect this change. Open to suggestions~~ => addressed

TODOs:

squashed commits
if necessary:
- includes documentation
- adds unit tests

/hold

netlify · 2026-05-18T07:52:55Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name	Link
🔨 Latest commit	`2225c1f`
🔍 Latest deploy log	https://app.netlify.com/projects/kubernetes-sigs-cluster-api-openstack/deploys/6a1535b96e41a00009dc6d3e
😎 Deploy Preview	https://deploy-preview-3169--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

nikParasyr · 2026-05-18T12:07:57Z

/test pull-cluster-api-provider-openstack-e2e-full-test

nikParasyr · 2026-05-18T12:48:07Z

/retest

nikParasyr · 2026-05-19T05:12:43Z

@lentzi90 && @bnallapeta, this is ready from my side

bnallapeta

Looks good overall. Minor comment.

Also, on the status question, I think its best to change the below to maintain consistency. If we don't do this, we might carry the inconsistency in naming in the long run.

Status.APIServerLoadBalancer → Status.ManagedAPIServerLoadBalancer

bnallapeta · 2026-05-19T09:30:49Z


 			for _, v := range flavors {
-				if v.Enabled && v.Name == *openStackCluster.Spec.APIServerLoadBalancer.Flavor {
+				if v.Enabled && v.Name == *openStackCluster.Spec.APIServer.ManagedLoadBalancer.Flavor {


technically, although this is the same, I think we should change this to lbSpec.Flavour to maintain consistency with the rest of the code.

bnallapeta · 2026-05-19T09:30:56Z

 			}
 			if lbFlavorID == "" {
-				record.Warnf(openStackCluster, "OctaviaFlavorNotFound", "Flavor %s specified for Octavia not found, using the default flavor.", *openStackCluster.Spec.APIServerLoadBalancer.Flavor)
+				record.Warnf(openStackCluster, "OctaviaFlavorNotFound", "Flavor %s specified for Octavia not found, using the default flavor.", *openStackCluster.Spec.APIServer.ManagedLoadBalancer.Flavor)


Same as above.

bnallapeta · 2026-05-19T09:31:02Z

 		}

-		availabilityZone = openStackCluster.Spec.APIServerLoadBalancer.AvailabilityZone
+		availabilityZone = openStackCluster.Spec.APIServer.ManagedLoadBalancer.AvailabilityZone


Same as above.

lentzi90

Great stuff!
I have basically only one thing that needs fixing. The other two are just minor things.
We probably don't test that specific jsonpatch in the e2e tests so this is why it wasn't detected.

Consolidate the various flat API server fields (apiServerFloatingIP, apiServerFixedIP, apiServerPort, disableAPIServerFloatingIP, and apiServerLoadBalancer) into a single structured spec.apiServer object, with apiServerLoadBalancer renamed to managedLoadBalancer within it. Includes conversion from v1beta1 and updated webhook validation.

…ancer Rename the status field for consistency with the spec-side rename introduced in the API server fields restructure (spec.apiServer.managedLoadBalancer). Includes conversion functions and updated tests.

nikParasyr · 2026-05-26T05:55:48Z

/test pull-cluster-api-provider-openstack-e2e-full-test

nikParasyr · 2026-05-26T05:57:10Z

@lentzi90 && @bnallapeta:
I think ive addressed all your remarks ( amended on the first commit ).
I also made a second commit the the status change ( apiServerLoadBalancer => apiServerManagedLoadBalancer)

lentzi90

/approve

k8s-ci-robot · 2026-05-27T10:41:56Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lentzi90

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [lentzi90]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

bnallapeta · 2026-06-01T06:35:14Z

/lgtm

nikParasyr · 2026-06-01T07:01:11Z

/hold cancel

k8s-ci-robot · 2026-06-01T08:32:14Z

@nikParasyr: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-openstack-e2e-test	`2225c1f`	link	unknown	`/test pull-cluster-api-provider-openstack-e2e-test`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

nikParasyr · 2026-06-01T09:04:32Z

/retest

nikParasyr · 2026-06-01T11:42:53Z

/retest

github-project-automation Bot added this to CAPO Roadmap May 18, 2026

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2026

github-project-automation Bot moved this to Inbox in CAPO Roadmap May 18, 2026

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 18, 2026

k8s-ci-robot requested review from EmilienM and mandre May 18, 2026 07:53

nikParasyr force-pushed the v1beta2_lb branch 2 times, most recently from 7b48a64 to de89db1 Compare May 18, 2026 08:36

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 18, 2026

nikParasyr force-pushed the v1beta2_lb branch 6 times, most recently from 967292a to 4a40e56 Compare May 18, 2026 11:07

bnallapeta reviewed May 19, 2026

View reviewed changes

nikParasyr force-pushed the v1beta2_lb branch from 4a40e56 to 75c3e94 Compare May 19, 2026 12:37

lentzi90 reviewed May 22, 2026

View reviewed changes

Comment thread templates/clusterclass-dev-test.yaml Outdated

Comment thread controllers/openstackmachine_controller.go Outdated

Comment thread kustomize/without-lb/patch-without-lb.yaml

nikParasyr force-pushed the v1beta2_lb branch from 75c3e94 to f885b04 Compare May 26, 2026 05:37

Rename status.apiServerLoadBalancer to status.apiServerManagedLoadBal…

2225c1f

…ancer Rename the status field for consistency with the spec-side rename introduced in the API server fields restructure (spec.apiServer.managedLoadBalancer). Includes conversion functions and updated tests.

lentzi90 reviewed May 27, 2026

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 27, 2026

nikParasyr requested a review from bnallapeta May 27, 2026 13:00

k8s-ci-robot assigned bnallapeta Jun 1, 2026

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 1, 2026

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 1, 2026

k8s-ci-robot merged commit 46bb4b6 into kubernetes-sigs:main Jun 1, 2026
21 of 23 checks passed

github-project-automation Bot moved this from Inbox to Done in CAPO Roadmap Jun 1, 2026

nikParasyr deleted the v1beta2_lb branch June 1, 2026 12:35

Conversation

nikParasyr commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Uh oh!

nikParasyr commented May 18, 2026

Uh oh!

nikParasyr commented May 18, 2026

Uh oh!

nikParasyr commented May 19, 2026

Uh oh!

bnallapeta left a comment

Choose a reason for hiding this comment

Uh oh!

bnallapeta May 19, 2026

Choose a reason for hiding this comment

Uh oh!

bnallapeta May 19, 2026

Choose a reason for hiding this comment

Uh oh!

bnallapeta May 19, 2026

Choose a reason for hiding this comment

Uh oh!

lentzi90 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nikParasyr commented May 26, 2026

Uh oh!

nikParasyr commented May 26, 2026

Uh oh!

lentzi90 left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented May 27, 2026

Uh oh!

bnallapeta commented Jun 1, 2026

Uh oh!

nikParasyr commented Jun 1, 2026

Uh oh!

k8s-ci-robot commented Jun 1, 2026

Uh oh!

nikParasyr commented Jun 1, 2026

Uh oh!

nikParasyr commented Jun 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nikParasyr commented May 18, 2026 •

edited

Loading

netlify Bot commented May 18, 2026 •

edited

Loading