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

support-multiple-tenants-in-one-org #189

Merged
merged 4 commits into from
Dec 10, 2024
Merged

Conversation

QuentinBisson
Copy link
Contributor

What this PR does / why we need it

This PR adds support for multiple tenant in the grafana organization CRs to support multiple organizations on the read path for plaform teams and so on giantswarm/roadmap#3784

Checklist

  • Update changelog in CHANGELOG.md.
  • Follow deployment test procedure in the tests/manual_e2e directory and have a working branch.

@QuentinBisson QuentinBisson self-assigned this Dec 10, 2024
@QuentinBisson QuentinBisson requested a review from a team as a code owner December 10, 2024 09:57
@QuentinBisson QuentinBisson force-pushed the support-multiple-tenants branch from 60d8e3a to 999bc3c Compare December 10, 2024 10:34
@QuentinBisson QuentinBisson force-pushed the support-multiple-tenants branch from 999bc3c to bb9e438 Compare December 10, 2024 10:57
@@ -0,0 +1,210 @@
package predicates
Copy link
Member

Choose a reason for hiding this comment

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

I am confused, what have those test to do with the changes in this PR ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nothing, I forgot to push it in an earlier PR

Copy link
Member

Choose a reason for hiding this comment

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

Ok happens, fine

@@ -224,14 +224,23 @@ func (r GrafanaOrganizationReconciler) configureSharedOrg(ctx context.Context) e
return nil
}

func newOrganization(grafanaOrganization *v1alpha1.GrafanaOrganization) *grafana.Organization {
Copy link
Member

Choose a reason for hiding this comment

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

Would be best when this function return no pointer.

@QuentinBisson QuentinBisson mentioned this pull request Dec 10, 2024
2 tasks
@QuentinBisson QuentinBisson force-pushed the support-multiple-tenants branch from bb9e438 to d9b3fa4 Compare December 10, 2024 16:18
@QuentinBisson QuentinBisson enabled auto-merge (squash) December 10, 2024 17:03
@QuentinBisson QuentinBisson merged commit 068fc03 into main Dec 10, 2024
8 checks passed
@QuentinBisson QuentinBisson deleted the support-multiple-tenants branch December 10, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants