Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update component to support OCP4.8+ console route configuration #8

Merged
merged 7 commits into from
Oct 14, 2021

Conversation

simu
Copy link
Member

@simu simu commented Oct 12, 2021

The component has new parameters openshift_version and route which should be used to configure a custom console hostname.

On OCP4.8 the component creates a resource locker patch to add the custom console hostname to the ingress.config.openshift.io/cluster custom resource, as documented in customizing the console.

The parameter openshift_version is used to provide users the option to still configure the OpenShift console hostname via the
console.operator.openshift.io/cluster custom resource on OCP4.7 and older.

Checklist

The component has new parameters `openshift_version` and `route` which
should be used to configure a custom console hostname.

On OCP4.8 the component creates a resource locker patch to add the
custom console hostname to the `ingress.config.openshift.io/cluster`
custom resource, as documented in [customizing the console].

The parameter `openshift_version` is used to provide users the option to
still configure the OpenShift console hostname via the
`console.operator.openshift.io/cluster` custom resource on OCP4.7 and
older.

[customizing the console]: https://docs.openshift.com/container-platform/4.8/web_console/customizing-the-web-console.html#customizing-the-console-route_customizing-web-console
@simu simu added the enhancement New feature or request label Oct 12, 2021
Add tests for testing custom route configuration on OCP 4.7 and 4.8 (the
component default).
@simu simu force-pushed the feat/support-ocp48-route-configuration branch from 6c46863 to 1f4c99c Compare October 12, 2021 09:34
This commit adjusts the implementation to fall back to the new style
(OCP4.8+) console hostname configuration if the parameter
`openshift_version` cannot be parsed.
Now parameter `route` supports configuring both the console and download
routes.

Additionally, we also give parameter `route` precedence over parameter
`config.route` when compiling the component for OCP4.7 or older.
@simu simu force-pushed the feat/support-ocp48-route-configuration branch from 1fdeb56 to 9af8919 Compare October 12, 2021 11:13
@simu simu marked this pull request as ready for review October 12, 2021 11:15
@simu simu requested review from corvus-ch and glrf October 12, 2021 14:07
This version includes the fix for the misgenerated resource names when
creating the clusterrole for resource locker patches.
@simu simu force-pushed the feat/support-ocp48-route-configuration branch from 8f6c5cf to 948ef83 Compare October 13, 2021 14:55
@simu
Copy link
Member Author

simu commented Oct 13, 2021

NOTE: This PR requires component-resource-locker v2.1.0 or newer

@simu simu merged commit a1035a4 into master Oct 14, 2021
@simu simu deleted the feat/support-ocp48-route-configuration branch October 14, 2021 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants