The query-tee node port is now optional (#3272)

Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Marco Pracucci <marco@pracucci.com>
grafana · Oct 21, 2022 · 35d35d2 · 35d35d2
1 parent 31d9b85
commit 35d35d2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@
 
 ### Jsonnet
 
+* [ENHANCEMENT] The query-tee node port (`$._config.query_tee_node_port`) is now optional. #3272
 * [BUGFIX] Fixed query-scheduler ring configuration for dedicated ruler's queries and query-frontends. #3237 #3239
 
 ### Mimirtool

diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet
@@ -87,6 +87,7 @@
     query_tee_enabled: false,
     query_tee_backend_endpoints: [],
     query_tee_backend_preferred: '',
+    query_tee_node_port: null,
 
     grpcConfig:: {
       'server.grpc.keepalive.min-time-between-pings': '10s',

diff --git a/operations/mimir/query-tee.libsonnet b/operations/mimir/query-tee.libsonnet
@@ -27,7 +27,7 @@
   query_tee_service: if !($._config.query_tee_enabled) then {} else
     service.new('query-tee', { name: 'query-tee' }, [
       servicePort.newNamed('http', 80, 80) +
-      servicePort.withNodePort($._config.query_tee_node_port),
+      (if $._config.query_tee_node_port == null then {} else servicePort.withNodePort($._config.query_tee_node_port)),
     ]) +
     service.mixin.spec.withType('NodePort'),
 }