tempo-query: separate tls settings for server and client #4177
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
frzifus
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
yvrhdn,
zalegrala,
electron0zero,
ie-pham,
stoewer and
javiermolinar
as code owners
pavolloffay
reviewed
Oct 12, 2024
| @@ -11,6 +11,7 @@ type Config struct { | |||
| Address string `yaml:"address"` | |||
| Backend string `yaml:"backend"` | |||
| TLSEnabled bool `yaml:"tls_enabled" category:"advanced"` | |||
| TLSServerEnabeld bool `yaml:"tls_server_enabled" category:"advanced"` | |||
There was a problem hiding this comment.
can you make some comments for TLSEnabled and TLSServerEnabled ?
frzifus
force-pushed
the
tempo-query/server-tls
branch
from
8e8207e
to
b9dc33f
Compare
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
frzifus
force-pushed
the
tempo-query/server-tls
branch
from
b9dc33f
to
b493a12
Compare
|
@frzifus once this is merged please open a PR to backport it to release-v2.6 branch |
joe-elliott
approved these changes
Oct 14, 2024
|
Hello @joe-elliott!
Please, if the current pull request addresses a bug fix, label it with the |
|
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-4177-to-release-v2.6 origin/release-v2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x a2f70c975850ac4ad31c8d92a11f85bf74a945e4When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-4177-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 4177 --json body --template 'Backport a2f70c975850ac4ad31c8d92a11f85bf74a945e4 from #4177{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] tempo-query: separate tls settings for server and client' --body-file - --label 'type/bug' --label 'backport' --base release-v2.6 --milestone release-v2.6 --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-4177-to-release-v2.6
# Create a pull request where the `base` branch is `release-v2.6` and the `compare`/`head` branch is `backport-4177-to-release-v2.6`.
# Remove the local backport branch
git switch main
git branch -D backport-4177-to-release-v2.6 |
joe-elliott
pushed a commit
that referenced
this pull request
Oct 15, 2024
* tempo-query: separate tls settings for server and client Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> * tempo-query: add changelog and comments to config Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> --------- Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> (cherry picked from commit a2f70c9)
3 tasks
joe-elliott
added a commit
that referenced
this pull request
Oct 15, 2024
* tempo-query: separate tls settings for server and client Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> * tempo-query: add changelog and comments to config Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> --------- Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> (cherry picked from commit a2f70c9) Co-authored-by: Ben B <bongartz@klimlive.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
This PR extends tempo-query with the possibility to configure tls for server and client individually.
cc @pavolloffay
Which issue(s) this PR fixes:
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]