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.

Sign up for GitHub

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

Jump to bottom

operator: Add support for custom tenant topology in rules #9366

Merged
merged 6 commits into from
May 3, 2023
Merged

operator: Add support for custom tenant topology in rules #9366

merged 6 commits into from
May 3, 2023

Conversation

periklis
Copy link
Collaborator

@periklis periklis commented May 2, 2023

What this PR does / why we need it:
Currently using tenant modes static and dynamic on OpenShift clusters limits AlertingRule and RecordingRule resources to using the same static tenant IDs as in mode openshift-logging. However static and dynamic respresent the default break-out modes for custom tenant topologies. This PR adds a custom annotations to decouple AlertingRule and RecordingRule validation from enforcing the default openshift-logging tenants.

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 requested a review from xperimental May 2, 2023 09:58
@periklis periklis requested a review from a team as a code owner May 2, 2023 09:58
@periklis periklis self-assigned this May 2, 2023
xperimental
xperimental reviewed May 2, 2023
View reviewed changes
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.

Sorry for this round. Did not properly read the error message before...

operator/internal/validation/openshift/common.go Outdated Show resolved Hide resolved
operator/internal/validation/openshift/alertingrule_test.go Outdated Show resolved Hide resolved
operator/internal/validation/openshift/recordingrule_test.go Outdated Show resolved Hide resolved
operator/apis/loki/v1/v1.go Show resolved Hide resolved
@periklis periklis merged commit 7d01d99 into grafana:main May 3, 2023
aminesnow pushed a commit to aminesnow/loki that referenced this pull request May 4, 2023
@periklis
operator: Add support for custom tenant topology in rules (grafana#9366)
dec4e82
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xperimental xperimental xperimental approved these changes

Assignees

@periklis periklis

Labels
sig/operator size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@periklis @xperimental