Fix using the compactor grpc client

grafana · Dec 12, 2022 · 30af567 · 30af567
1 parent ea0e673
commit 30af567
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/operator/internal/manifests/config.go b/operator/internal/manifests/config.go
@@ -99,14 +99,14 @@ func ConfigOptions(opt Options) config.Options {
 			},
 			ServerNames: config.TLSServerNames{
 				GRPC: config.GRPCServerNames{
+					Compactor:     fqdn(serviceNameCompactorGRPC(opt.Name), opt.Namespace),
 					IndexGateway:  fqdn(serviceNameIndexGatewayGRPC(opt.Name), opt.Namespace),
 					Ingester:      fqdn(serviceNameIngesterGRPC(opt.Name), opt.Namespace),
 					QueryFrontend: fqdn(serviceNameQueryFrontendGRPC(opt.Name), opt.Namespace),
 					Ruler:         fqdn(serviceNameRulerGRPC(opt.Name), opt.Namespace),
 				},
 				HTTP: config.HTTPServerNames{
-					Compactor: fqdn(serviceNameCompactorHTTP(opt.Name), opt.Namespace),
-					Querier:   fqdn(serviceNameQuerierHTTP(opt.Name), opt.Namespace),
+					Querier: fqdn(serviceNameQuerierHTTP(opt.Name), opt.Namespace),
 				},
 			},
 		},

diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go
@@ -2440,12 +2440,12 @@ querier:
   max_concurrent: 2
   query_ingesters_within: 3h
   tail_max_duration: 1h
-delete_client:
+compactor_grpc_client:
   tls_enabled: true
-  tls_cert_path: /var/run/tls/http/tls.crt
-  tls_key_path: /var/run/tls/http/tls.key
+  tls_cert_path: /var/run/tls/grpc/tls.crt
+  tls_key_path: /var/run/tls/grpc/tls.key
   tls_ca_path: /var/run/tls/ca.pem
-  tls_server_name: compactor-http.svc
+  tls_server_name: compactor-grpc.svc
   tls_cipher_suites: cipher1,cipher2
   tls_min_version: VersionTLS12
 query_range:
@@ -2568,14 +2568,14 @@ overrides:
 			},
 			ServerNames: TLSServerNames{
 				GRPC: GRPCServerNames{
+					Compactor:     "compactor-grpc.svc",
 					IndexGateway:  "index-gateway-grpc.svc",
 					Ingester:      "ingester-grpc.svc",
 					QueryFrontend: "query-frontend-grpc.svc",
 					Ruler:         "ruler-grpc.svc",
 				},
 				HTTP: HTTPServerNames{
-					Compactor: "compactor-http.svc",
-					Querier:   "querier-http.svc",
+					Querier: "querier-http.svc",
 				},
 			},
 		},

diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml
@@ -180,13 +180,13 @@ querier:
   query_ingesters_within: 3h
   tail_max_duration: 1h
   max_concurrent: {{ .MaxConcurrent.AvailableQuerierCPUCores }}
-{{- if .Gates.HTTPEncryption }}
-delete_client:
+{{- if .Gates.GRPCEncryption }}
+compactor_grpc_client:
   tls_enabled: true
-  tls_cert_path: {{ .TLS.Paths.HTTP.Certificate }}
-  tls_key_path: {{ .TLS.Paths.HTTP.Key }}
+  tls_cert_path: {{ .TLS.Paths.GRPC.Certificate }}
+  tls_key_path: {{ .TLS.Paths.GRPC.Key }}
   tls_ca_path: {{ .TLS.Paths.CA }}
-  tls_server_name: {{ .TLS.ServerNames.HTTP.Compactor }}
+  tls_server_name: {{ .TLS.ServerNames.GRPC.Compactor }}
   tls_cipher_suites: {{ .TLS.CipherSuitesString }}
   tls_min_version: {{ .TLS.MinTLSVersion }}
 {{- end }}

diff --git a/operator/internal/manifests/internal/config/options.go b/operator/internal/manifests/internal/config/options.go
@@ -198,13 +198,13 @@ type TLSServerNames struct {
 }
 
 type GRPCServerNames struct {
+	Compactor     string
 	IndexGateway  string
 	Ingester      string
 	QueryFrontend string
 	Ruler         string
 }
 
 type HTTPServerNames struct {
-	Compactor string
-	Querier   string
+	Querier string
 }