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.

Sign up for GitHub

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

Jump to bottom

operator: Fix lookup CA Bundle options on fresh install #7596

Merged
merged 2 commits into from
Nov 4, 2022
Merged

operator: Fix lookup CA Bundle options on fresh install #7596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40dcfae
operator: Fix lookup CA Bundle options on fresh install
periklis Nov 4, 2022
2d6b94a
Add missing changelog entry for 7064 and new for 7596
periklis Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Main

- [7596](https://github.com/grafana/loki/pull/7596) **periklis**: Fix fresh-installs with built-in cert management enabled
- [7064](https://github.com/grafana/loki/pull/7064) **periklis**: Add support for built-in cert management
- [7471](https://github.com/grafana/loki/pull/7471) **aminesnow**: Expose and migrate query_timeout in limits config
- [7437](https://github.com/grafana/loki/pull/7437) **aminesnow**: Fix Custom TLS profile setting for LokiStack on OpenShift
- [7415](https://github.com/grafana/loki/pull/7415) **aminesnow**: Add alert relabel config
Expand Down
4 changes: 4 additions & 0 deletions operator/internal/handlers/internal/certificates/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ func configureCertificatesForTenantMode(certs certrotation.ComponentCertificates
}

func configureCABundleForTenantMode(cm *corev1.ConfigMap, mode lokiv1.ModeType) {
if cm == nil {
return
}

switch mode {
case "", lokiv1.Dynamic, lokiv1.Static:
return
Expand Down