✨ Add componentRoutes support to ROSAControlPlane by reedcort · Pull Request #6183 · kubernetes-sigs/cluster-api-provider-aws

reedcort · 2026-08-12T14:22:26Z

What type of PR is this?

/kind feature
/kind api-change

What this PR does / why we need it:

Adds support for customizing console and downloads route hostnames and TLS certificates on ROSA HCP clusters managed via Cluster API.

This enables ROSA HCP customers to configure custom component routes (e.g. console.company.com) through the ROSAControlPlane CRD as a day-2 operation. The feature is already supported via the OCM API, ROSA CLI, and Terraform provider.

Which issue(s) this PR fixes:

ROSA HCP clusters managed via Cluster API cannot configure custom hostnames for console and downloads routes. This PR adds componentRoutes to the ROSAControlPlane spec to enable this.

Special notes for your reviewer:

ComponentRoutes is an optional map field on RosaControlPlaneSpec — no impact on existing clusters
Only console and downloads keys are valid. OAuth is not configurable on HCP

AI Usage:

Claude Code (Claude Opus) was used to assist with code generation and test writing. I reviewed every line before committing and validated the changes compile and pass unit tests locally.

Checklist:

Release note:

Add componentRoutes support to ROSAControlPlane for customizing console and downloads route hostnames and TLS certificates on ROSA HCP clusters.

kubernetes-prow · 2026-08-12T14:22:34Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign dlipovetsky for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

linux-foundation-easycla · 2026-08-12T14:22:35Z

The committers listed above are authorized under a signed CLA.

✅ login: reedcort / name: Cortney Reed (8366a6c)

kubernetes-prow · 2026-08-12T14:22:36Z

Welcome @reedcort!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

kubernetes-prow · 2026-08-12T14:22:37Z

Hi @reedcort. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

reedcort · 2026-08-17T12:58:55Z

@serngawy The PR is ready for review. I have made the recommended changes.

serngawy · 2026-08-17T13:28:12Z

/ok-to-test

reedcort · 2026-08-17T19:30:36Z

/retest-required

serngawy

thanks @reedcort , looks good to me.

serngawy · 2026-08-18T14:32:36Z

/hold

serngawy · 2026-08-18T14:33:19Z

@andclt would you review as well

andclt · 2026-08-18T19:07:25Z

+	desiredRoutes := rosaScope.ControlPlane.Spec.ComponentRoutes
+	if len(desiredRoutes) == 0 {
+		return nil
+	}
+


Instead of returning early here should we check similarly to what findExistingLogForwarders does for reconcileLogForwarders if there's an existing ingress with component routes set and clear them?

yeah customers should be able to pass in empty strings to clear existing routes.

andclt · 2026-08-18T19:09:49Z

+	keys := []rosacontrolplanev1.ComponentRouteKey{rosacontrolplanev1.ComponentRouteConsole, rosacontrolplanev1.ComponentRouteDownloads}
+	routes := make(map[string]*cmv1.ComponentRouteBuilder, len(keys))
+	for _, key := range keys {
+		routes[string(key)] = cmv1.NewComponentRoute().Hostname("").TlsSecretRef("")


just out of curiosity does the OCM API accepts empty strings for Hostname and TlsSecretRef?

yes it does

Add support for customizing console and downloads route hostnames and TLS certificates on ROSA HCP clusters via the ROSAControlPlane CRD. Signed-off-by: Cortney Reed <creed@redhat.com>

serngawy · 2026-08-19T12:49:24Z

/test pull-cluster-api-provider-aws-apidiff-main

kubernetes-prow · 2026-08-19T12:51:51Z

@reedcort: 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-aws-apidiff-main	`d6599c3`	link	false	`/test pull-cluster-api-provider-aws-apidiff-main`

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.

tinaafitz · 2026-08-20T15:32:07Z

Test Results ✅

Tested componentRoutes end-to-end on a ROSA HCP cluster (OCP 4.22.8) using this image on a Minikube hub with CAPI v1.13.4.

All cases passed:

Set console route → OCM updated correctly
Set console + downloads together → both confirmed via OCM ingresses API
Remove routes → OCM reverted to default hostname
Invalid name value → webhook rejected as expected
Idempotency → componentRoutesEqual() skips OCM call when unchanged

serngawy · 2026-08-24T17:19:57Z

@nrb would you review/lgtm this PR, I believe the apidiff fail because of the ocmClient interface changes not API changes.Can we override the failed job ?

serngawy · 2026-08-24T17:20:30Z

/unhold

kubernetes-prow Bot requested review from nrb and serngawy August 12, 2026 14:22

kubernetes-prow Bot added the needs-priority label Aug 12, 2026

kubernetes-prow Bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 12, 2026

kubernetes-prow Bot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Aug 12, 2026

reedcort marked this pull request as ready for review August 12, 2026 14:22

kubernetes-prow Bot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Aug 12, 2026

serngawy suggested changes Aug 12, 2026

View reviewed changes

Comment thread controlplane/rosa/api/v1beta2/rosacontrolplane_types.go Outdated

Comment thread controlplane/rosa/webhooks/rosacontrolplane_webhook.go

serngawy reviewed Aug 12, 2026

View reviewed changes

Comment thread controlplane/rosa/api/v1beta2/rosacontrolplane_types.go Outdated

reedcort force-pushed the ROSAENG-60617-component-routes branch from 8366a6c to e213b72 Compare August 12, 2026 19:26

serngawy reviewed Aug 17, 2026

View reviewed changes

Comment thread controlplane/rosa/api/v1beta2/rosacontrolplane_types.go Outdated

Comment thread controlplane/rosa/controllers/rosacontrolplane_controller.go Outdated

kubernetes-prow Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 17, 2026

reedcort force-pushed the ROSAENG-60617-component-routes branch from e213b72 to d54fc81 Compare August 17, 2026 13:54

serngawy approved these changes Aug 18, 2026

View reviewed changes

kubernetes-prow Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 18, 2026

andclt reviewed Aug 18, 2026

View reviewed changes

reedcort force-pushed the ROSAENG-60617-component-routes branch from d54fc81 to 2833071 Compare August 18, 2026 19:29

kubernetes-prow Bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 18, 2026

feat: add componentRoutes support to ROSAControlPlane

d6599c3

Add support for customizing console and downloads route hostnames and TLS certificates on ROSA HCP clusters via the ROSAControlPlane CRD. Signed-off-by: Cortney Reed <creed@redhat.com>

reedcort force-pushed the ROSAENG-60617-component-routes branch from 2833071 to d6599c3 Compare August 18, 2026 19:41

kubernetes-prow Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 24, 2026

Uh oh!

Conversation

reedcort commented Aug 12, 2026

Uh oh!

kubernetes-prow Bot commented Aug 12, 2026

Uh oh!

linux-foundation-easycla Bot commented Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kubernetes-prow Bot commented Aug 12, 2026

Uh oh!

kubernetes-prow Bot commented Aug 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

reedcort commented Aug 17, 2026

Uh oh!

Uh oh!

Uh oh!

serngawy commented Aug 17, 2026

Uh oh!

reedcort commented Aug 17, 2026

Uh oh!

serngawy left a comment

Choose a reason for hiding this comment

Uh oh!

serngawy commented Aug 18, 2026

Uh oh!

serngawy commented Aug 18, 2026

Uh oh!

andclt Aug 18, 2026

Choose a reason for hiding this comment

Uh oh!

reedcort Aug 18, 2026

Choose a reason for hiding this comment

Uh oh!

andclt Aug 18, 2026

Choose a reason for hiding this comment

Uh oh!

reedcort Aug 18, 2026

Choose a reason for hiding this comment

Uh oh!

serngawy commented Aug 19, 2026

Uh oh!

kubernetes-prow Bot commented Aug 19, 2026

Uh oh!

tinaafitz commented Aug 20, 2026

Uh oh!

serngawy commented Aug 24, 2026

Uh oh!

serngawy commented Aug 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

linux-foundation-easycla Bot commented Aug 12, 2026 •

edited

Loading