Revert "Remove tenant_header_key from config (#2414)"#2795
Conversation
|
Hello @joe-elliott!
Please, if the current pull request addresses a bug fix, label it with the |
This reverts commit affcf7c.
4964951 to
e469679
Compare
|
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-2795-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 d9210d04c6782c155b537299b9f7923506fe0f95
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continueIf you have the GitHub CLI installed: # Create the PR body template
PR_BODY=$(gh pr view 2795 --json body --template 'Backport d9210d04c6782c155b537299b9f7923506fe0f95 from #2795{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Push the branch to GitHub and a PR
echo "${PR_BODY}" | gh pr create --title "[release-v2.2] Revert \"Remove tenant_header_key from config (#2414)\"" --body-file - --label "type/bug" --label "backport" --base release-v2.2 --milestone release-v2.2 --webOr, 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-2795-to-release-v2.2
# Remove the local backport branch
git switch main
git branch -D backport-2795-to-release-v2.2Unless you've used the GitHub CLI above, now create a pull request where the |
Reverts #2414. This config field was in use by RH for authentication through jaeger-query.