Add ability to pass TLS certs and keys inline #349
Merged
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
56quarters
approved these changes
Aug 8, 2023
1 task
1 task
MichelHollands
added a commit
to grafana/loki
that referenced
this pull request
Aug 14, 2023
**What this PR does / why we need it**: This PR upgrades `github.com/grafana/dskit` removes Loki's dependency on `github.com/weaveworks/common`. The changes in dskit, apart from the migration (grafana/dskit#356), are: * grafana/dskit#347 * grafana/dskit#349, which required small changes in `pkg/canary/reader/reader.go` and `pkg/canary/writer/push.go` * grafana/dskit#352 * grafana/dskit#354 **Which issue(s) this PR fixes**: (none) **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [n/a] Documentation added - [n/a] Tests updated - [n/a] `CHANGELOG.md` updated - [n/a] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [n/a] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [n/a] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](d10549e) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
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:
With prometheus/exporter-toolkit#158, it is now possible to pass forward TLS certificates and keys inline as part of the
TLSConfigfor the Server.This PR also extends the
TLSConfigwithinServer.goto allow the TLS certificate, private key and client CAs to be passed inline as a string. The content of this string is expected to be exactly the same as a file, a PEM-encoded sequence of bytes. All parameters are then passed forward toweb.TLSConfigwithinprometheus/exporter-toolkitas before.Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]