operator: Apply delete client changes for compat with release-2.7.x (#7815)

undelete
Periklis Tsirakidis 3 years ago committed by GitHub
parent b5563cee08
commit 54e6c19fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      operator/CHANGELOG.md
  2. 3
      operator/internal/manifests/internal/config/build_test.go
  3. 2
      operator/internal/manifests/internal/config/loki-config.yaml

@ -1,5 +1,6 @@
## Main
- [7815](https://github.com/grafana/loki/pull/7815) **periklis**: Apply delete client changes for compat with release-2.7.x
- [7809](https://github.com/grafana/loki/pull/7809) **xperimental**: Fix histogram-based alerting rules
- [7808](https://github.com/grafana/loki/pull/7808) **xperimental**: Replace fifocache usage by embedded_cache
- [7753](https://github.com/grafana/loki/pull/7753) **periklis**: Check for mandatory CA configmap name in ObjectStorageTLS spec

@ -2440,7 +2440,7 @@ querier:
max_concurrent: 2
query_ingesters_within: 3h
tail_max_duration: 1h
compactor_client:
delete_client:
tls_enabled: true
tls_cert_path: /var/run/tls/http/tls.crt
tls_key_path: /var/run/tls/http/tls.key
@ -2631,7 +2631,6 @@ overrides:
}
cfg, rCfg, err := Build(opts)
require.NoError(t, err)
t.Log(string(cfg))
require.YAMLEq(t, expCfg, string(cfg))
require.YAMLEq(t, expRCfg, string(rCfg))
}

@ -181,7 +181,7 @@ querier:
tail_max_duration: 1h
max_concurrent: {{ .MaxConcurrent.AvailableQuerierCPUCores }}
{{- if .Gates.HTTPEncryption }}
compactor_client:
delete_client:
tls_enabled: true
tls_cert_path: {{ .TLS.Paths.HTTP.Certificate }}
tls_key_path: {{ .TLS.Paths.HTTP.Key }}

Loading…
Cancel
Save