fix array concatenation broken due to an extra level of composition

Signed-off-by: Michal Wasilewski <[email protected]>

Author: mwasilew2

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

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

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

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

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

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

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

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

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

@@ -152,9 +152,7 @@ function(params) {
           },
         },
       ] + (
-        if std.length(tq.config.extraEnv) > 0 then [
-          tq.config.extraEnv,
-        ] else []
+        if std.length(tq.config.extraEnv) > 0 then tq.config.extraEnv else []
       ),
       ports: [
         { name: port.name, containerPort: port.port }

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

@@ -112,9 +112,7 @@ function(params) {
                 },
               },
             ] + (
-              if std.length(tr.config.extraEnv) > 0 then [
-                tr.config.extraEnv,
-              ] else []
+              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' }],

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

@@ -114,9 +114,7 @@ function(params) {
           } },
         }] else []
       ) + (
-        if std.length(tr.config.extraEnv) > 0 then [
-          tr.config.extraEnv,
-        ] 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

@@ -148,9 +148,7 @@ function(params) {
           },
         },
       ] + (
-        if std.length(tr.config.extraEnv) > 0 then [
-          tr.config.extraEnv,
-        ] 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-store.libsonnet

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