-
Notifications
You must be signed in to change notification settings - Fork 530
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
Backport https://github.com/cortexproject/cortex/pull/4897 to fix IDMSv1 #2760
Conversation
Signed-off-by: Jakub Coufal <[email protected]>
Signed-off-by: Jakub Coufal <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me. Thanks for the PR. I tested an image with this change against minio and things work as expected. I've not had a chance to test against s3 when node role is not in use, which I think would be good to do before merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was able to test this change against s3 also. Thanks for the PR.
@zalegrala Hi, any chance this could get backported to 2.2? It blocks us adopting the 2.2.x series. |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2760-to-release-v2.2 origin/release-v2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ba621f626506f986e2c76cc379e6af56660891f4
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continue If you have the GitHub CLI installed: # Create the PR body template
PR_BODY=$(gh pr view 2760 --json body --template 'Backport ba621f626506f986e2c76cc379e6af56660891f4 from #2760{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Push the branch to GitHub and a PR
echo "${PR_BODY}" | gh pr create --title "[release-v2.2] Backport https://github.com/cortexproject/cortex/pull/4897 to fix IDMSv1" --body-file - --label "type/bug" --label "backport" --base release-v2.2 --milestone release-v2.2 --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # If you don't have the GitHub CLI installed: Push the branch to GitHub and manually create a PR:
git push --set-upstream origin backport-2760-to-release-v2.2
# Remove the local backport branch
git switch main
git branch -D backport-2760-to-release-v2.2 Unless you've used the GitHub CLI above, now create a pull request where the |
@coufalja thank you for this PR. @zalegrala championed this internally and we decided to cut a quick 2.2.2. We appreciate your help improving Tempo 🙏 |
* Backport cortexproject/cortex#4897 to fix IDMSv1 Signed-off-by: Jakub Coufal <[email protected]> * Update CHANGELOG.md Signed-off-by: Jakub Coufal <[email protected]> --------- Signed-off-by: Jakub Coufal <[email protected]> (cherry picked from commit ba621f6)
* Backport cortexproject/cortex#4897 to fix IDMSv1 Signed-off-by: Jakub Coufal <[email protected]> * Update CHANGELOG.md Signed-off-by: Jakub Coufal <[email protected]> --------- Signed-off-by: Jakub Coufal <[email protected]> (cherry picked from commit ba621f6) Co-authored-by: Jakub Coufal <[email protected]>
Thats awesome, thank you! |
What this PR does:
Backports Cortex fix to tempo to fix issue with IDMSv1 and node role auth.
Which issue(s) this PR fixes:
Fixes #2743
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]