Merge pull request #6 from projectsyn/bump-thanos

Update dependencies

Author: Simon Rüegg

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Disable dashboards by default ([#1])
 - Upgrade to v0.18.0 ([#2])
+- Update dependencies ([#6])
 
 ### Fixed
 
@@ -28,3 +29,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#3]: https://github.com/projectsyn/component-thanos/pulls/3
 [#4]: https://github.com/projectsyn/component-thanos/pulls/4
 [#5]: https://github.com/projectsyn/component-thanos/pulls/5
+[#6]: https://github.com/projectsyn/component-thanos/pulls/6

component/bucket.libsonnet

@@ -7,19 +7,7 @@ local kube = import 'lib/kube.libjsonnet';
 local inv = kap.inventory();
 local params = inv.parameters.thanos;
 
-local bucket = thanos.bucket(params.commonConfig + params.bucket) {
-  deployment+: {
-    spec+: {
-      template+: {
-        spec+: {
-          securityContext+: {
-            runAsUser: 10001,
-          },
-        },
-      },
-    },
-  },
-};
+local bucket = thanos.bucket(params.commonConfig + params.bucket);
 
 if params.bucket.enabled then {
   ['bucket/' + name]: bucket[name]

component/compactor.libsonnet

@@ -8,25 +8,14 @@ local inv = kap.inventory();
 local params = inv.parameters.thanos;
 
 local compactor = thanos.compact(params.commonConfig + params.compactor) {
-  statefulSet+: {
-    spec+: {
-      template+: {
-        spec+: {
-          securityContext+: {
-            runAsUser: 10001,
-          },
-        },
-      },
-    },
-  },
   alerts+: kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'thanos-compactor-alerts') {
     metadata+: {
       namespace: params.namespace,
     },
     spec+: {
       groups+:
         std.filter(
-          function(group) group.name == 'thanos-compact.rules',
+          function(group) group.name == 'thanos-compact',
           thanosMixin.prometheusAlerts.groups
         ),
     },

component/query.libsonnet

@@ -10,25 +10,14 @@ local params = inv.parameters.thanos;
 local query = thanos.query(params.commonConfig + params.query {
   [if params.store.enabled then 'stores']+: [ 'dnssrv+_grpc._tcp.thanos-store.%s.svc.cluster.local' % params.namespace ],
 }) {
-  deployment+: {
-    spec+: {
-      template+: {
-        spec+: {
-          securityContext+: {
-            runAsUser: 10001,
-          },
-        },
-      },
-    },
-  },
   alerts+: kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'thanos-query-alerts') {
     metadata+: {
       namespace: params.namespace,
     },
     spec+: {
       groups+:
         std.filter(
-          function(group) group.name == 'thanos-query.rules',
+          function(group) group.name == 'thanos-query',
           thanosMixin.prometheusAlerts.groups
         ),
     },

component/store.libsonnet

@@ -8,25 +8,14 @@ local inv = kap.inventory();
 local params = inv.parameters.thanos;
 
 local store = thanos.store(params.commonConfig + params.store) {
-  statefulSet+: {
-    spec+: {
-      template+: {
-        spec+: {
-          securityContext+: {
-            runAsUser: 10001,
-          },
-        },
-      },
-    },
-  },
   alerts+: kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'thanos-store-alerts') {
     metadata+: {
       namespace: params.namespace,
     },
     spec+: {
       groups+:
         std.filter(
-          function(group) group.name == 'thanos-store.rules',
+          function(group) group.name == 'thanos-store',
           thanosMixin.prometheusAlerts.groups
         ),
     },

jsonnetfile.json

@@ -8,7 +8,7 @@
           "subdir": "jsonnet/kube-thanos"
         }
       },
-      "version": "v0.17.0"
+      "version": "24ddf6aef1b2302213e58891d60feae2b41c765f"
     },
     {
       "source": {
@@ -17,7 +17,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "v0.17.2"
+      "version": "v0.18.0"
     }
   ],
   "legacyImports": true