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

operator: Enable Route by default on OpenShift clusters #9346

Merged
merged 7 commits into from
May 8, 2023

Conversation

periklis
Copy link
Collaborator

@periklis periklis commented Apr 28, 2023

What this PR does / why we need it:
With the availability of the community-openshift (See #8881) bundle we control all available hubs for OpenShift clusters. Thus we can assume that a user using either the redhat-openshift-ecosystem/community-operators-prod hub or the RedHat internal catalogs installs this Operator on an OpenShift clusters. Therefore we can always assume that the following facilities are available:

  • OpenShift Route
  • OpenShift Service Certificates Controller

This PR decouples reconciling a Route and a CABundle ConfigMap from the user selection of tenant mode. Formerly the user had to select either tenant mode openshift-logging or openshift-network to inform the operator that the hosting cluster is OpenShift. In the proposed change the cluster flavor is controlled automatically via the bundled feature gates configuration.

In addition this enables using the tenant modes static and dynamic with public OIDC providers via the route.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@periklis periklis self-assigned this Apr 28, 2023
@periklis periklis requested a review from a team as a code owner April 28, 2023 18:59
@pull-request-size pull-request-size bot added size/L and removed size/M labels May 2, 2023
Copy link
Contributor

@aminesnow aminesnow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a code improvement suggestion, otherwise LGTM.

Copy link
Collaborator

@xperimental xperimental left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can still find two references of gatewayRoute:

  • in feature_gates.md (needs a make web-pre)
  • in config.grafana.com_projectconfigs.yaml

The second one seems to be an old reference that has not been updated in a while. I currently do not remember how to update that file... Is it possible that we generated that file once "by accident" and did not delete it afterwards?

@periklis
Copy link
Collaborator Author

periklis commented May 8, 2023

I can still find two references of gatewayRoute:

* in `feature_gates.md` (needs a `make web-pre`)

* in `config.grafana.com_projectconfigs.yaml`

The second one seems to be an old reference that has not been updated in a while. I currently do not remember how to update that file... Is it possible that we generated that file once "by accident" and did not delete it afterwards?

The generate YAML file is actually obsolete as per this CRD is not used for the API. However kubebuilder/operator-sdk generated this file initially.

Copy link
Collaborator

@xperimental xperimental left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a rebase, but otherwise lgtm 👍

@periklis periklis merged commit f7e13cc into grafana:main May 8, 2023
periklis added a commit to periklis/loki that referenced this pull request May 23, 2023
periklis added a commit to periklis/loki that referenced this pull request May 23, 2023
periklis added a commit to openshift/loki that referenced this pull request May 23, 2023
periklis added a commit to openshift/loki that referenced this pull request May 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants