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

Backport https://github.com/cortexproject/cortex/pull/4897 to fix IDMSv1 #2760

Merged
merged 2 commits into from
Aug 4, 2023
Merged

Conversation

coufalja
Copy link
Contributor

@coufalja coufalja commented Aug 3, 2023

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

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

@CLAassistant
Copy link

CLAassistant commented Aug 3, 2023

CLA assistant check
All committers have signed the CLA.

Signed-off-by: Jakub Coufal <[email protected]>
Copy link
Contributor

@zalegrala zalegrala left a 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.

Copy link
Contributor

@zalegrala zalegrala left a 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.

@coufalja
Copy link
Contributor Author

@zalegrala Hi, any chance this could get backported to 2.2? It blocks us adopting the 2.2.x series.

@joe-elliott joe-elliott added type/bug Something isn't working backport release-v2.2 labels Aug 30, 2023
@github-actions
Copy link
Contributor

The backport to release-v2.2 failed:

The process '/usr/bin/git' failed with exit code 1

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 base branch is release-v2.2 and the compare/head branch is backport-2760-to-release-v2.2.

@joe-elliott
Copy link
Member

joe-elliott commented Aug 30, 2023

@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 🙏

joe-elliott pushed a commit that referenced this pull request Aug 30, 2023
* 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)
joe-elliott added a commit that referenced this pull request Aug 30, 2023
* 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]>
@coufalja
Copy link
Contributor Author

Thats awesome, thank you!

@joe-elliott
Copy link
Member

2.2.2 released

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Storage S3 - AWS node role IMDSv1 does not work after upgrade to v2.2
4 participants