Merge pull request grafana/cortex-jsonnet#234 from grafana/fix-grpc-settings

pracucci · web-flow · commit 932beeeb71dd · 2020-12-22T14:51:32.000+01:00
Fixed gRPC settings
diff --git a/operations/mimir/ingester.libsonnet b/operations/mimir/ingester.libsonnet
@@ -41,15 +41,17 @@
       else {}
     ),
 
-  ingester_statefulset_args:: {
-    'ingester.wal-enabled': true,
-    'ingester.checkpoint-enabled': true,
-    'ingester.recover-from-wal': true,
-    'ingester.wal-dir': $._config.ingester.wal_dir,
-    'ingester.checkpoint-duration': '15m',
-    '-log.level': 'info',
-    'ingester.tokens-file-path': $._config.ingester.wal_dir + '/tokens',
-  },
+  ingester_statefulset_args::
+    $._config.grpcConfig +
+    {
+      'ingester.wal-enabled': true,
+      'ingester.checkpoint-enabled': true,
+      'ingester.recover-from-wal': true,
+      'ingester.wal-dir': $._config.ingester.wal_dir,
+      'ingester.checkpoint-duration': '15m',
+      '-log.level': 'info',
+      'ingester.tokens-file-path': $._config.ingester.wal_dir + '/tokens',
+    },
 
   ingester_ports:: $.util.defaultPorts,
 
diff --git a/operations/mimir/query-frontend.libsonnet b/operations/mimir/query-frontend.libsonnet
@@ -2,7 +2,7 @@
   local container = $.core.v1.container,
 
   query_frontend_args::
-    $._config.ringConfig +
+    $._config.grpcConfig +
     {
       target: 'query-frontend',
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`local container = $.core.v1.container,`
`3`	`3`
`4`	`4`	`query_frontend_args::`
`5`		`- $._config.ringConfig +`
	`5`	`+ $._config.grpcConfig +`
`6`	`6`	`{`
`7`	`7`	`target: 'query-frontend',`
`8`	`8`