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

Use the tenant package from dskit #1599

Merged
merged 1 commit into from
Mar 31, 2022
Merged

Use the tenant package from dskit #1599

merged 1 commit into from
Mar 31, 2022

Conversation

56quarters
Copy link
Contributor

This is required because Mimir sets a default resolver based on if
tenant federation is enabled. However, GEM has already updated to the
dskit resolver and so doesn't use the correct or same resolver that
Mimir is.

Signed-off-by: Nick Pillitteri nick.pillitteri@grafana.com

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@CLAassistant
Copy link

CLAassistant commented Mar 31, 2022

CLA assistant check
All committers have signed the CLA.

@pstibrany
Copy link
Member

Please note that there is already #1587 in progress that updates dskit. There is still one problem to fix (with advanced flags).

@pstibrany
Copy link
Member

If you merge this, I can also rebase my PR and fix remaining problems there.

@56quarters
Copy link
Contributor Author

56quarters commented Mar 31, 2022

Please note that there is already #1587 in progress that updates dskit. There is still one problem to fix (with advanced flags).

It looks like the changes to flagext.Secret will conflict / overlap between these PRs. I'll rebase after #1587 is merged. Thanks!

Will merge this as-is and let @pstibrany fix remaining problems.

This is required because Mimir sets a default resolver based on if
tenant federation is enabled. However, GEM has already updated to the
dskit resolver and so doesn't use the correct or same resolver that
Mimir is.

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
@56quarters 56quarters merged commit 8f8f2c0 into main Mar 31, 2022
@56quarters 56quarters deleted the 56quarters/dskit-tenant branch March 31, 2022 20:32
dimitarvdimitrov added a commit that referenced this pull request Apr 1, 2022
pracucci pushed a commit that referenced this pull request Apr 1, 2022
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.

4 participants