Merge pull request #251 from mwasilew2/add-extra-env-vars

Add extra env vars to all components deployed with kube-thanos

CHANGELOG.md

@@ -25,6 +25,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 
 - [#237](https://github.com/thanos-io/kube-thanos/pull/237) Add new bucket replicate component.
 - [#245](https://github.com/thanos-io/kube-thanos/pull/245) Support scraping config reloader sidecar for ruler.
+- [#251](https://github.com/thanos-io/kube-thanos/pull/251) Add support for extraEnv (custom environment variables) to all components.
 
 ### Fixed
 

jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet

@@ -20,6 +20,7 @@ local defaults = {
   maxTime: '',
   compactionLevels: [],
   resolutions: [],
+  extraEnv: [],
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-bucket-replicate',
@@ -138,7 +139,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(tbr.config.extraEnv) > 0 then tbr.config.extraEnv else []
+      ),
       ports: [
         { name: name, containerPort: tbr.config.ports[name] }
         for name in std.objectFields(tbr.config.ports)

jsonnet/kube-thanos/kube-thanos-bucket.libsonnet

@@ -15,6 +15,7 @@ local defaults = {
     http: 10902,
   },
   tracing: {},
+  extraEnv: [],
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-bucket',
@@ -118,7 +119,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(tb.config.extraEnv) > 0 then tb.config.extraEnv else []
+      ),
       ports: [
         { name: name, containerPort: tb.config.ports[name] }
         for name in std.objectFields(tb.config.ports)

jsonnet/kube-thanos/kube-thanos-compact-default-params.libsonnet

@@ -23,6 +23,7 @@
     http: 10902,
   },
   tracing: {},
+  extraEnv: [],
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-compact',

jsonnet/kube-thanos/kube-thanos-compact.libsonnet

@@ -93,7 +93,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(tc.config.extraEnv) > 0 then tc.config.extraEnv else []
+      ),
       ports: [
         { name: name, containerPort: tc.config.ports[name] }
         for name in std.objectFields(tc.config.ports)

jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet

@@ -29,6 +29,7 @@ local defaults = {
     http: 9090,
   },
   tracing: {},
+  extraEnv: [],
 
   memcachedDefaults+:: {
     config+: {
@@ -179,7 +180,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(tqf.config.extraEnv) > 0 then tqf.config.extraEnv else []
+      ),
       ports: [
         { name: name, containerPort: tqf.config.ports[name] }
         for name in std.objectFields(tqf.config.ports)

jsonnet/kube-thanos/kube-thanos-query.libsonnet

@@ -24,6 +24,7 @@ local defaults = {
   logLevel: 'info',
   logFormat: 'logfmt',
   tracing: {},
+  extraEnv: [],
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-query',
@@ -150,7 +151,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(tq.config.extraEnv) > 0 then tq.config.extraEnv else []
+      ),
       ports: [
         { name: port.name, containerPort: port.port }
         for port in tq.service.spec.ports

jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet

@@ -30,6 +30,7 @@
     'receive="true"',
   ],
   tenantLabelName: null,
+  extraEnv: [],
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-receive',

jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet

@@ -111,7 +111,9 @@ function(params) {
                   },
                 },
               },
-            ],
+            ] + (
+              if std.length(tr.config.extraEnv) > 0 then tr.config.extraEnv else []
+            ),
             ports: [{ name: name, containerPort: tr.config.ports[name] } for name in std.objectFields(tr.config.ports)],
             volumeMounts: [{ name: 'hashring-config', mountPath: '/var/lib/thanos-receive' }],
             livenessProbe: { failureThreshold: 8, periodSeconds: 30, httpGet: {

jsonnet/kube-thanos/kube-thanos-receive.libsonnet

@@ -113,6 +113,8 @@ function(params) {
             name: tr.config.objectStorageConfig.name,
           } },
         }] else []
+      ) + (
+        if std.length(tr.config.extraEnv) > 0 then tr.config.extraEnv else []
       ),
       ports: [
         { name: name, containerPort: tr.config.ports[name] }

jsonnet/kube-thanos/kube-thanos-rule.libsonnet

@@ -26,6 +26,7 @@ local defaults = {
     reloader: 9533,
   },
   tracing: {},
+  extraEnv: [],
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-rule',
@@ -146,7 +147,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(tr.config.extraEnv) > 0 then tr.config.extraEnv else []
+      ),
       ports: [
         { name: name, containerPort: tr.config.ports[name] }
         for name in std.objectFields(tr.config.ports)

jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet

@@ -24,6 +24,7 @@
   tracing: {},
   minTime: '',
   maxTime: '',
+  extraEnv: [],
 
   memcachedDefaults+:: {
     config+: {

jsonnet/kube-thanos/kube-thanos-store.libsonnet

@@ -99,10 +99,15 @@ function(params) {
         ] else []
       ),
       env: [
-        { name: 'OBJSTORE_CONFIG', valueFrom: { secretKeyRef: {
-          key: ts.config.objectStorageConfig.key,
-          name: ts.config.objectStorageConfig.name,
-        } } },
+        {
+          name: 'OBJSTORE_CONFIG',
+          valueFrom: {
+            secretKeyRef: {
+              key: ts.config.objectStorageConfig.key,
+              name: ts.config.objectStorageConfig.name,
+            },
+          },
+        },
         {
           // Inject the host IP to make configuring tracing convenient.
           name: 'HOST_IP_ADDRESS',
@@ -112,7 +117,9 @@ function(params) {
             },
           },
         },
-      ],
+      ] + (
+        if std.length(ts.config.extraEnv) > 0 then ts.config.extraEnv else []
+      ),
       ports: [
         { name: name, containerPort: ts.config.ports[name] }
         for name in std.objectFields(ts.config.ports)