fix(tanka): add customizable common env vars (#6124)

Signed-off-by: Ivan Rizzante <i.rizzante@gmail.com>
grafana · May 17, 2022 · 6fb86c4 · 6fb86c4
1 parent 0691563
commit 6fb86c4
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 4 deletions.
diff --git a/production/ksonnet/loki/boltdb_shipper.libsonnet b/production/ksonnet/loki/boltdb_shipper.libsonnet
@@ -62,7 +62,8 @@
     container.mixin.readinessProbe.httpGet.withPath('/ready') +
     container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
-    k.util.resourcesRequests('4', '2Gi')
+    k.util.resourcesRequests('4', '2Gi') +
+    container.withEnvMixin($._config.commonEnvs)
   else {},
 
   compactor_statefulset: if $._config.using_boltdb_shipper then

diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet
@@ -141,6 +141,8 @@
       'limits.per-user-override-config': '/etc/loki/overrides/overrides.yaml',
     },
 
+    commonEnvs: [],
+
     loki: {
       server: {
         graceful_shutdown_timeout: '5s',

diff --git a/production/ksonnet/loki/distributor.libsonnet b/production/ksonnet/loki/distributor.libsonnet
@@ -17,7 +17,8 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     container.mixin.readinessProbe.withInitialDelaySeconds(15) +
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
     k.util.resourcesRequests('500m', '500Mi') +
-    k.util.resourcesLimits('1', '1Gi'),
+    k.util.resourcesLimits('1', '1Gi') +
+    container.withEnvMixin($._config.commonEnvs),
 
   local deployment = k.apps.v1.deployment,
 

diff --git a/production/ksonnet/loki/index-gateway.libsonnet b/production/ksonnet/loki/index-gateway.libsonnet
@@ -48,7 +48,8 @@
     container.mixin.readinessProbe.httpGet.withPath('/ready') +
     container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
-    k.util.resourcesRequests('500m', '2Gi')
+    k.util.resourcesRequests('500m', '2Gi') +
+    container.withEnvMixin($._config.commonEnvs)
   else {},
 
   index_gateway_statefulset: if $._config.use_index_gateway then

diff --git a/production/ksonnet/loki/ingester.libsonnet b/production/ksonnet/loki/ingester.libsonnet
@@ -25,6 +25,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
     k.util.resourcesRequests('1', '5Gi') +
     k.util.resourcesLimits('2', '10Gi') +
+    container.withEnvMixin($._config.commonEnvs) +
     if $._config.stateful_ingesters then
       container.withVolumeMountsMixin([
         volumeMount.new('ingester-data', '/data'),

diff --git a/production/ksonnet/loki/querier.libsonnet b/production/ksonnet/loki/querier.libsonnet
@@ -19,6 +19,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     container.mixin.readinessProbe.withInitialDelaySeconds(15) +
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
     k.util.resourcesRequests('4', '2Gi') +
+    container.withEnvMixin($._config.commonEnvs) +
     if $._config.stateful_queriers then
       container.withVolumeMountsMixin([
         volumeMount.new('querier-data', '/data'),

diff --git a/production/ksonnet/loki/query-frontend.libsonnet b/production/ksonnet/loki/query-frontend.libsonnet
@@ -17,6 +17,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
     container.mixin.readinessProbe.withInitialDelaySeconds(15) +
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
+    container.withEnvMixin($._config.commonEnvs) +
     $.jaeger_mixin +
     // sharded queries may need to do a nonzero amount of aggregation on the frontend.
     if $._config.queryFrontend.sharded_queries_enabled then

diff --git a/production/ksonnet/loki/query-scheduler.libsonnet b/production/ksonnet/loki/query-scheduler.libsonnet
@@ -39,7 +39,8 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     container.withArgsMixin(k.util.mapToFlags($.query_scheduler_args)) +
     $.jaeger_mixin +
     k.util.resourcesRequests('2', '600Mi') +
-    k.util.resourcesLimits(null, '1200Mi')
+    k.util.resourcesLimits(null, '1200Mi') +
+    container.withEnvMixin($._config.commonEnvs)
   else {},
 
   local deployment = k.apps.v1.deployment,

diff --git a/production/ksonnet/loki/ruler.libsonnet b/production/ksonnet/loki/ruler.libsonnet
@@ -27,6 +27,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
       k.util.resourcesRequests('1', '6Gi') +
       k.util.resourcesLimits('16', '16Gi') +
       $.util.readinessProbe +
+      container.withEnvMixin($._config.commonEnvs) +
       $.jaeger_mixin +
       if $._config.stateful_rulers then
         container.withVolumeMountsMixin([

diff --git a/production/ksonnet/loki/table-manager.libsonnet b/production/ksonnet/loki/table-manager.libsonnet
@@ -25,6 +25,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
     container.mixin.readinessProbe.withInitialDelaySeconds(15) +
     container.mixin.readinessProbe.withTimeoutSeconds(1) +
+    container.withEnvMixin($._config.commonEnvs) +
     k.util.resourcesRequests('100m', '100Mi') +
     k.util.resourcesLimits('200m', '200Mi'),