operator: Apply delete client changes for compat with release-2.7.x (g…

…rafana#7815)
periklis · Nov 30, 2022 · 54e6c19 · 54e6c19
1 parent b5563ce
commit 54e6c19
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -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

diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go
@@ -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))
 }
diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml
@@ -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 }}