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

Update to latest dskit (new flagext.Secret and move of pkg/tenant) #1356

Merged
merged 4 commits into from
Apr 5, 2022
Merged

Update to latest dskit (new flagext.Secret and move of pkg/tenant) #1356

merged 4 commits into from
Apr 5, 2022

Conversation

simonswine
Copy link
Contributor

  • Update dskit
  • Refactor to make use of new secret flag type
  • Use tenant package from dskit

@CLAassistant
Copy link

CLAassistant commented Apr 1, 2022 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@simonswine simonswine changed the title 20220401 update dskit Update to latest dskit (new flagext.Secret and move of pkg/tenant) Apr 1, 2022
@simonswine simonswine force-pushed the 20220401_update-dskit branch 2 times, most recently from c373f79 to b0d34c2 Compare April 1, 2022 09:18
@simonswine simonswine marked this pull request as ready for review April 1, 2022 09:46
annanay25
annanay25 approved these changes Apr 5, 2022
View reviewed changes
Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @simonswine. Left a few minor comments.

tempodb/backend/s3/config.go Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
@simonswine simonswine force-pushed the 20220401_update-dskit branch from b0d34c2 to c53a9b7 Compare April 5, 2022 09:47
@simonswine
Copy link
Contributor Author

A bit unsure what's wrong with CI, but it seems to be in other PRs as well: (e.g. https://github.com/grafana/tempo/runs/5822436282?check_suite_focus=true)

@simonswine simonswine force-pushed the 20220401_update-dskit branch from c53a9b7 to 60487b0 Compare April 5, 2022 13:12
annanay25
annanay25 approved these changes Apr 5, 2022
View reviewed changes
Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM.

@annanay25 annanay25 merged commit 464dcbf into main Apr 5, 2022
@annanay25 annanay25 deleted the 20220401_update-dskit branch April 5, 2022 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@annanay25 annanay25 annanay25 approved these changes

@joe-elliott joe-elliott Awaiting requested review from joe-elliott joe-elliott is a code owner

@mdisibio mdisibio Awaiting requested review from mdisibio mdisibio is a code owner

@dgzlopes dgzlopes Awaiting requested review from dgzlopes

@mapno mapno Awaiting requested review from mapno mapno is a code owner

@yvrhdn yvrhdn Awaiting requested review from yvrhdn yvrhdn is a code owner

@zalegrala zalegrala Awaiting requested review from zalegrala zalegrala is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@simonswine @CLAassistant @annanay25