From 98766ee1593c5ddbf336da27fdd785bb3b7d8b9f Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Fri, 15 May 2020 14:25:28 +0200 Subject: [PATCH 1/9] Add store withCachingBucketMemcached mixin Signed-off-by: Kemal Akkoyun --- all.jsonnet | 4 +- ...anos-store-statefulSet-with-memcached.yaml | 18 ++++ .../kube-thanos/kube-thanos-store.libsonnet | 83 +++++++++++++++---- 3 files changed, 90 insertions(+), 15 deletions(-) diff --git a/all.jsonnet b/all.jsonnet index 4292f971..b56d7048 100644 --- a/all.jsonnet +++ b/all.jsonnet @@ -83,7 +83,9 @@ local s = local swm = t.store + t.store.withVolumeClaimTemplate + - t.store.withServiceMonitor + t.store.withMemcachedIndexCache + + t.store.withServiceMonitor + + t.store.withIndexCacheMemcached + + t.store.withCachingBucketMemcached + commonConfig + { config+:: { name: 'thanos-store', diff --git a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml index 641b0f6e..9d015575 100644 --- a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml +++ b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml @@ -45,6 +45,24 @@ spec: "max_item_size": "1MiB" "timeout": "500ms" "type": "MEMCACHED" + - |- + --store.caching-bucket.config="backend": "memcached" + "backend_config": + "addresses": + - "dnssrv+_client._tcp..thanos.svc.cluster.local" + "dns_provider_update_interval": "10s" + "max_async_buffer_size": 10000 + "max_async_concurrency": 20 + "max_get_multi_batch_size": 0 + "max_get_multi_concurrency": 100 + "max_idle_connections": 100 + "max_item_size": "1MiB" + "timeout": "500ms" + "caching_config": + "chunk_object_size_ttl": "24h" + "chunk_subrange_size": 16000 + "chunk_subrange_ttl": "24h" + "max_chunks_get_range_requests": 3 env: - name: OBJSTORE_CONFIG valueFrom: diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index 13f104de..a8776623 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -120,22 +120,24 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, }, - withMemcachedIndexCache:: { + local memcachedDefaults = { + // List of memcached addresses, that will get resolved with the DNS service discovery provider. + // For DNS service discovery reference https://thanos.io/service-discovery.md/#dns-service-discovery + addresses: error 'must provide memcached addresses', + timeout: '500ms', + maxIdleConnections: 100, + maxAsyncConcurrency: 20, + maxAsyncBufferSize: 10000, + maxItemSize: '1MiB', + maxGetMultiConcurrency: 100, + maxGetMultiBatchSize: 0, + dnsProviderUpdateInterval: '10s', + }, + + withIndexCacheMemcached:: { local ts = self, config+:: { - memcached+: { - // List of memcached addresses, that will get resolved with the DNS service discovery provider. - // For DNS service discovery reference https://thanos.io/service-discovery.md/#dns-service-discovery - addresses: error 'must provide memcached addresses', - timeout: '500ms', - maxIdleConnections: 100, - maxAsyncConcurrency: 20, - maxAsyncBufferSize: 10000, - maxItemSize: '1MiB', - maxGetMultiConcurrency: 100, - maxGetMultiBatchSize: 0, - dnsProviderUpdateInterval: '10s', - }, + memcached+: memcachedDefaults, }, local m = ts.config.memcached, local cfg = @@ -172,6 +174,59 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, }, + withCachingBucketMemcached:: { + local ts = self, + config+:: { + memcached+: memcachedDefaults, + bucketCacheConfig+: { + chunkSubrangeSize: 16000, + maxChunksGetRangeRequests: 3, + chunkObjectSizeTTL: '24h', + chunkSubrangeTTL: '24h', + }, + }, + local m = ts.config.memcached, + local c = ts.config.bucketCacheConfig, + local cfg = + { + backend: 'memcached', + backend_config: { + addresses: m.addresses, + timeout: m.timeout, + max_idle_connections: m.maxIdleConnections, + max_async_concurrency: m.maxAsyncConcurrency, + max_async_buffer_size: m.maxAsyncBufferSize, + max_item_size: m.maxItemSize, + max_get_multi_concurrency: m.maxGetMultiConcurrency, + max_get_multi_batch_size: m.maxGetMultiBatchSize, + dns_provider_update_interval: m.dnsProviderUpdateInterval, + }, + + caching_config: { + chunk_subrange_size: c.chunkSubrangeSize, + max_chunks_get_range_requests: c.maxChunksGetRangeRequests, + chunk_object_size_ttl: c.chunkObjectSizeTTL, + chunk_subrange_ttl: c.chunkSubrangeTTL, + }, + }, + statefulSet+: { + spec+: { + template+: { + spec+: { + containers: [ + if c.name == 'thanos-store' then c { + args+: [ + '--store.caching-bucket.config=' + std.manifestYamlDoc(cfg), + ], + } else c + for c in super.containers + ], + }, + }, + }, + }, + }, + withServiceMonitor:: { local ts = self, serviceMonitor: { From 25ff25aa3b84ac8946e6cf720b1a9f26509c0165 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Fri, 15 May 2020 14:26:39 +0200 Subject: [PATCH 2/9] Enable to specify different memcached backends for index cache and cache bucket Signed-off-by: Kemal Akkoyun --- jsonnet/kube-thanos/kube-thanos-store.libsonnet | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index a8776623..be9f8657 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -139,7 +139,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; config+:: { memcached+: memcachedDefaults, }, - local m = ts.config.memcached, + local m = if std.objectHas(ts.config.memcached, 'indexCache') + then + ts.config.memcached.indexCache + else + ts.config.memcached, local cfg = { type: 'MEMCACHED', @@ -185,7 +189,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; chunkSubrangeTTL: '24h', }, }, - local m = ts.config.memcached, + local m = if std.objectHas(ts.config.memcached, 'bucketCache') + then + ts.config.memcached.bucketCache + else + ts.config.memcached, local c = ts.config.bucketCacheConfig, local cfg = { From 683835913a89d006410824c51221d2799b1e5ee6 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Fri, 15 May 2020 14:30:01 +0200 Subject: [PATCH 3/9] Bump version to minimum supported that includes added feature Signed-off-by: Kemal Akkoyun --- README.md | 2 +- all.jsonnet | 2 +- example.jsonnet | 2 +- examples/all/manifests/thanos-bucket-deployment.yaml | 6 +++--- examples/all/manifests/thanos-bucket-service.yaml | 2 +- examples/all/manifests/thanos-compact-service.yaml | 2 +- examples/all/manifests/thanos-compact-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-compact-statefulSet.yaml | 6 +++--- examples/all/manifests/thanos-query-deployment.yaml | 6 +++--- examples/all/manifests/thanos-query-service.yaml | 2 +- examples/all/manifests/thanos-query-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-receive-service.yaml | 2 +- examples/all/manifests/thanos-receive-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-receive-statefulSet.yaml | 6 +++--- examples/all/manifests/thanos-rule-service.yaml | 2 +- examples/all/manifests/thanos-rule-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-rule-statefulSet.yaml | 6 +++--- examples/all/manifests/thanos-store-service.yaml | 2 +- examples/all/manifests/thanos-store-serviceMonitor.yaml | 2 +- .../manifests/thanos-store-statefulSet-with-memcached.yaml | 6 +++--- examples/all/manifests/thanos-store-statefulSet.yaml | 6 +++--- examples/thanos-receive.jsonnet | 2 +- manifests/thanos-query-deployment.yaml | 6 +++--- manifests/thanos-query-service.yaml | 2 +- manifests/thanos-query-serviceMonitor.yaml | 2 +- manifests/thanos-store-service.yaml | 2 +- manifests/thanos-store-serviceMonitor.yaml | 2 +- manifests/thanos-store-statefulSet.yaml | 6 +++--- 28 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 9b111c2b..dd08d870 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'v0.12.0', + version: 'master-2020-05-07-b9ff23c5', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/all.jsonnet b/all.jsonnet index b56d7048..d97276b9 100644 --- a/all.jsonnet +++ b/all.jsonnet @@ -7,7 +7,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'v0.12.0', + version: 'master-2020-05-07-b9ff23c5', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/example.jsonnet b/example.jsonnet index 3b815fe9..6c5ea136 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -7,7 +7,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'v0.12.0', + version: 'master-2020-05-07-b9ff23c5', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/examples/all/manifests/thanos-bucket-deployment.yaml b/examples/all/manifests/thanos-bucket-deployment.yaml index deeb4a77..8cc0b764 100644 --- a/examples/all/manifests/thanos-bucket-deployment.yaml +++ b/examples/all/manifests/thanos-bucket-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-bucket namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: containers: - args: @@ -34,7 +34,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-bucket-service.yaml b/examples/all/manifests/thanos-bucket-service.yaml index 02481598..358575bf 100644 --- a/examples/all/manifests/thanos-bucket-service.yaml +++ b/examples/all/manifests/thanos-bucket-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-bucket namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-service.yaml b/examples/all/manifests/thanos-compact-service.yaml index a4bd14ca..303233cf 100644 --- a/examples/all/manifests/thanos-compact-service.yaml +++ b/examples/all/manifests/thanos-compact-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-compact namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-serviceMonitor.yaml b/examples/all/manifests/thanos-compact-serviceMonitor.yaml index e9180bbb..5d6e0e8d 100644 --- a/examples/all/manifests/thanos-compact-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-compact-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-compact namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-statefulSet.yaml b/examples/all/manifests/thanos-compact-statefulSet.yaml index db954e1b..91e75e3e 100644 --- a/examples/all/manifests/thanos-compact-statefulSet.yaml +++ b/examples/all/manifests/thanos-compact-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-compact namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-query-deployment.yaml b/examples/all/manifests/thanos-query-deployment.yaml index 0f20b5d7..2371807d 100644 --- a/examples/all/manifests/thanos-query-deployment.yaml +++ b/examples/all/manifests/thanos-query-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-query namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: affinity: podAntiAffinity: @@ -47,7 +47,7 @@ spec: - --store=dnssrv+_grpc._tcp.thanos-receive.thanos.svc.cluster.local - --store=dnssrv+_grpc._tcp.thanos-rule.thanos.svc.cluster.local - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-query-service.yaml b/examples/all/manifests/thanos-query-service.yaml index b90a449f..d0040e2d 100644 --- a/examples/all/manifests/thanos-query-service.yaml +++ b/examples/all/manifests/thanos-query-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-query namespace: thanos spec: diff --git a/examples/all/manifests/thanos-query-serviceMonitor.yaml b/examples/all/manifests/thanos-query-serviceMonitor.yaml index aeef23f1..17126720 100644 --- a/examples/all/manifests/thanos-query-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-query-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-query namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-service.yaml b/examples/all/manifests/thanos-receive-service.yaml index 21ac8fb8..ee3463ce 100644 --- a/examples/all/manifests/thanos-receive-service.yaml +++ b/examples/all/manifests/thanos-receive-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-receive namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-serviceMonitor.yaml b/examples/all/manifests/thanos-receive-serviceMonitor.yaml index fa74916c..cbaaf29a 100644 --- a/examples/all/manifests/thanos-receive-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-receive-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-receive namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml index 74c4b6ce..1f91c691 100644 --- a/examples/all/manifests/thanos-receive-statefulSet.yaml +++ b/examples/all/manifests/thanos-receive-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-receive namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: affinity: podAntiAffinity: @@ -75,7 +75,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/all/manifests/thanos-rule-service.yaml b/examples/all/manifests/thanos-rule-service.yaml index 1d863ecb..97277a4a 100644 --- a/examples/all/manifests/thanos-rule-service.yaml +++ b/examples/all/manifests/thanos-rule-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-rule namespace: thanos spec: diff --git a/examples/all/manifests/thanos-rule-serviceMonitor.yaml b/examples/all/manifests/thanos-rule-serviceMonitor.yaml index a6bbb356..8d0cfffd 100644 --- a/examples/all/manifests/thanos-rule-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-rule-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-rule namespace: thanos spec: diff --git a/examples/all/manifests/thanos-rule-statefulSet.yaml b/examples/all/manifests/thanos-rule-statefulSet.yaml index c44f55c2..643c1b21 100644 --- a/examples/all/manifests/thanos-rule-statefulSet.yaml +++ b/examples/all/manifests/thanos-rule-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-rule namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: containers: - args: @@ -44,7 +44,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 24 httpGet: diff --git a/examples/all/manifests/thanos-store-service.yaml b/examples/all/manifests/thanos-store-service.yaml index c8dd69bd..be591406 100644 --- a/examples/all/manifests/thanos-store-service.yaml +++ b/examples/all/manifests/thanos-store-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: diff --git a/examples/all/manifests/thanos-store-serviceMonitor.yaml b/examples/all/manifests/thanos-store-serviceMonitor.yaml index e0b145f1..eb9340cb 100644 --- a/examples/all/manifests/thanos-store-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-store-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: diff --git a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml index 9d015575..384574d1 100644 --- a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml +++ b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: containers: - args: @@ -69,7 +69,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml index 7e66bd6c..b2368e6b 100644 --- a/examples/all/manifests/thanos-store-statefulSet.yaml +++ b/examples/all/manifests/thanos-store-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/thanos-receive.jsonnet b/examples/thanos-receive.jsonnet index 4544355b..e1019680 100644 --- a/examples/thanos-receive.jsonnet +++ b/examples/thanos-receive.jsonnet @@ -7,7 +7,7 @@ t.receive { local tr = self, name:: 'thanos-receive', namespace:: 'observability', - version:: 'v0.12.0-rc.0', + version:: 'master-2020-05-07-b9ff23c5', image:: 'quay.io/thanos/thanos:v' + tr.version, replicas:: 3, replicationFactor:: 3, diff --git a/manifests/thanos-query-deployment.yaml b/manifests/thanos-query-deployment.yaml index 89b440c4..20e07669 100644 --- a/manifests/thanos-query-deployment.yaml +++ b/manifests/thanos-query-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-query namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: affinity: podAntiAffinity: @@ -45,7 +45,7 @@ spec: - --query.replica-label=prometheus_replica - --query.replica-label=rule_replica - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 4 httpGet: diff --git a/manifests/thanos-query-service.yaml b/manifests/thanos-query-service.yaml index b90a449f..d0040e2d 100644 --- a/manifests/thanos-query-service.yaml +++ b/manifests/thanos-query-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-query namespace: thanos spec: diff --git a/manifests/thanos-query-serviceMonitor.yaml b/manifests/thanos-query-serviceMonitor.yaml index aeef23f1..17126720 100644 --- a/manifests/thanos-query-serviceMonitor.yaml +++ b/manifests/thanos-query-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-query namespace: thanos spec: diff --git a/manifests/thanos-store-service.yaml b/manifests/thanos-store-service.yaml index c8dd69bd..be591406 100644 --- a/manifests/thanos-store-service.yaml +++ b/manifests/thanos-store-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: diff --git a/manifests/thanos-store-serviceMonitor.yaml b/manifests/thanos-store-serviceMonitor.yaml index e0b145f1..eb9340cb 100644 --- a/manifests/thanos-store-serviceMonitor.yaml +++ b/manifests/thanos-store-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml index 7e66bd6c..b2368e6b 100644 --- a/manifests/thanos-store-statefulSet.yaml +++ b/manifests/thanos-store-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: v0.12.0 + app.kubernetes.io/version: master-2020-05-07-b9ff23c5 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:v0.12.0 + image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 livenessProbe: failureThreshold: 8 httpGet: From 99f13d8e5057c4c872149313241077fe9d385d2c Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Fri, 15 May 2020 14:36:56 +0200 Subject: [PATCH 4/9] Update Changelog Signed-off-by: Kemal Akkoyun --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eaed2ad..9d0b9d03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,13 +17,17 @@ We use *breaking* word for marking changes that are not backward compatible (rel - [#118](https://github.com/thanos-io/kube-thanos/pull/118) receive: Extend shutdown grace period to 900s (15min). +- [#122](https://github.com/thanos-io/kube-thanos/pull/122) store: Rename `withMemcachedIndexCache` to `withIndexCacheMemcached` + ### Added - [#105](https://github.com/thanos-io/kube-thanos/pull/105) compactor, store: Add deduplication replica label flags and delete delay labels - [#105](https://github.com/thanos-io/kube-thanos/pull/105) compactor, store: Add deduplication replica label flags and delete delay labels -- [#119](https://github.com/thanos-io/kube-thanos/pull/119) receive: Distribute receive instances across node zones via pod anti affinity (note: only available on 1.17+). +- [#119](https://github.com/thanos-io/kube-thanos/pull/119) receive: Distribute receive instances across node zones via pod anti affinity (note: only available on Kubernetes 1.17+) + +- [#122](https://github.com/thanos-io/kube-thanos/pull/122) store: Enable caching bucket support ### Fixed From c55438748d08ee923304677821cffebb051df486 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Mon, 18 May 2020 10:10:59 +0200 Subject: [PATCH 5/9] Bump version and reflect latest changes Signed-off-by: Kemal Akkoyun --- README.md | 2 +- all.jsonnet | 2 +- example.jsonnet | 2 +- .../manifests/thanos-bucket-deployment.yaml | 6 +++--- .../all/manifests/thanos-bucket-service.yaml | 2 +- .../all/manifests/thanos-compact-service.yaml | 2 +- .../thanos-compact-serviceMonitor.yaml | 2 +- .../manifests/thanos-compact-statefulSet.yaml | 6 +++--- .../manifests/thanos-query-deployment.yaml | 6 +++--- .../all/manifests/thanos-query-service.yaml | 2 +- .../thanos-query-serviceMonitor.yaml | 2 +- .../all/manifests/thanos-receive-service.yaml | 2 +- .../thanos-receive-serviceMonitor.yaml | 2 +- .../manifests/thanos-receive-statefulSet.yaml | 6 +++--- .../all/manifests/thanos-rule-service.yaml | 2 +- .../manifests/thanos-rule-serviceMonitor.yaml | 2 +- .../manifests/thanos-rule-statefulSet.yaml | 6 +++--- .../all/manifests/thanos-store-service.yaml | 2 +- .../thanos-store-serviceMonitor.yaml | 2 +- ...anos-store-statefulSet-with-memcached.yaml | 20 +++++++++++-------- .../manifests/thanos-store-statefulSet.yaml | 6 +++--- examples/thanos-receive.jsonnet | 2 +- .../kube-thanos/kube-thanos-store.libsonnet | 20 +++++++++++++------ manifests/thanos-query-deployment.yaml | 6 +++--- manifests/thanos-query-service.yaml | 2 +- manifests/thanos-query-serviceMonitor.yaml | 2 +- manifests/thanos-store-service.yaml | 2 +- manifests/thanos-store-serviceMonitor.yaml | 2 +- manifests/thanos-store-statefulSet.yaml | 6 +++--- 29 files changed, 69 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index dd08d870..d7d91b39 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'master-2020-05-07-b9ff23c5', + version: 'master-2020-05-18-6cfcb345', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/all.jsonnet b/all.jsonnet index d97276b9..c258ed55 100644 --- a/all.jsonnet +++ b/all.jsonnet @@ -7,7 +7,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'master-2020-05-07-b9ff23c5', + version: 'master-2020-05-18-6cfcb345', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/example.jsonnet b/example.jsonnet index 6c5ea136..24083acc 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -7,7 +7,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'master-2020-05-07-b9ff23c5', + version: 'master-2020-05-18-6cfcb345', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/examples/all/manifests/thanos-bucket-deployment.yaml b/examples/all/manifests/thanos-bucket-deployment.yaml index 8cc0b764..1b81ed0c 100644 --- a/examples/all/manifests/thanos-bucket-deployment.yaml +++ b/examples/all/manifests/thanos-bucket-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-bucket namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: containers: - args: @@ -34,7 +34,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-bucket-service.yaml b/examples/all/manifests/thanos-bucket-service.yaml index 358575bf..a4007200 100644 --- a/examples/all/manifests/thanos-bucket-service.yaml +++ b/examples/all/manifests/thanos-bucket-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-bucket namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-service.yaml b/examples/all/manifests/thanos-compact-service.yaml index 303233cf..1a18b632 100644 --- a/examples/all/manifests/thanos-compact-service.yaml +++ b/examples/all/manifests/thanos-compact-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-compact namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-serviceMonitor.yaml b/examples/all/manifests/thanos-compact-serviceMonitor.yaml index 5d6e0e8d..d0758817 100644 --- a/examples/all/manifests/thanos-compact-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-compact-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-compact namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-statefulSet.yaml b/examples/all/manifests/thanos-compact-statefulSet.yaml index 91e75e3e..d8e08a18 100644 --- a/examples/all/manifests/thanos-compact-statefulSet.yaml +++ b/examples/all/manifests/thanos-compact-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-compact namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-query-deployment.yaml b/examples/all/manifests/thanos-query-deployment.yaml index 2371807d..646578a8 100644 --- a/examples/all/manifests/thanos-query-deployment.yaml +++ b/examples/all/manifests/thanos-query-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-query namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: affinity: podAntiAffinity: @@ -47,7 +47,7 @@ spec: - --store=dnssrv+_grpc._tcp.thanos-receive.thanos.svc.cluster.local - --store=dnssrv+_grpc._tcp.thanos-rule.thanos.svc.cluster.local - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-query-service.yaml b/examples/all/manifests/thanos-query-service.yaml index d0040e2d..8256a64c 100644 --- a/examples/all/manifests/thanos-query-service.yaml +++ b/examples/all/manifests/thanos-query-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-query namespace: thanos spec: diff --git a/examples/all/manifests/thanos-query-serviceMonitor.yaml b/examples/all/manifests/thanos-query-serviceMonitor.yaml index 17126720..b18d809a 100644 --- a/examples/all/manifests/thanos-query-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-query-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-query namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-service.yaml b/examples/all/manifests/thanos-receive-service.yaml index ee3463ce..327ab24c 100644 --- a/examples/all/manifests/thanos-receive-service.yaml +++ b/examples/all/manifests/thanos-receive-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-receive namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-serviceMonitor.yaml b/examples/all/manifests/thanos-receive-serviceMonitor.yaml index cbaaf29a..a4824151 100644 --- a/examples/all/manifests/thanos-receive-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-receive-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-receive namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml index 1f91c691..ee8d3843 100644 --- a/examples/all/manifests/thanos-receive-statefulSet.yaml +++ b/examples/all/manifests/thanos-receive-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-receive namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: affinity: podAntiAffinity: @@ -75,7 +75,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/all/manifests/thanos-rule-service.yaml b/examples/all/manifests/thanos-rule-service.yaml index 97277a4a..65e6e6ee 100644 --- a/examples/all/manifests/thanos-rule-service.yaml +++ b/examples/all/manifests/thanos-rule-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-rule namespace: thanos spec: diff --git a/examples/all/manifests/thanos-rule-serviceMonitor.yaml b/examples/all/manifests/thanos-rule-serviceMonitor.yaml index 8d0cfffd..4370f62b 100644 --- a/examples/all/manifests/thanos-rule-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-rule-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-rule namespace: thanos spec: diff --git a/examples/all/manifests/thanos-rule-statefulSet.yaml b/examples/all/manifests/thanos-rule-statefulSet.yaml index 643c1b21..df84f24e 100644 --- a/examples/all/manifests/thanos-rule-statefulSet.yaml +++ b/examples/all/manifests/thanos-rule-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-rule namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: containers: - args: @@ -44,7 +44,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 24 httpGet: diff --git a/examples/all/manifests/thanos-store-service.yaml b/examples/all/manifests/thanos-store-service.yaml index be591406..705152cb 100644 --- a/examples/all/manifests/thanos-store-service.yaml +++ b/examples/all/manifests/thanos-store-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: diff --git a/examples/all/manifests/thanos-store-serviceMonitor.yaml b/examples/all/manifests/thanos-store-serviceMonitor.yaml index eb9340cb..c36c9fa6 100644 --- a/examples/all/manifests/thanos-store-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-store-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: diff --git a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml index 384574d1..3b47e21c 100644 --- a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml +++ b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: containers: - args: @@ -58,18 +58,22 @@ spec: "max_idle_connections": 100 "max_item_size": "1MiB" "timeout": "500ms" - "caching_config": - "chunk_object_size_ttl": "24h" - "chunk_subrange_size": 16000 - "chunk_subrange_ttl": "24h" - "max_chunks_get_range_requests": 3 + "blocks_iter_ttl": "5m" + "chunk_object_size_ttl": "24h" + "chunk_subrange_size": 16000 + "chunk_subrange_ttl": "24h" + "max_chunks_get_range_requests": 3 + "metafile_content_ttl": "24h" + "metafile_doesnt_exist_ttl": "15m" + "metafile_exists_ttl": "2h" + "metafile_max_size": "1MiB" env: - name: OBJSTORE_CONFIG valueFrom: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml index b2368e6b..4fd29628 100644 --- a/examples/all/manifests/thanos-store-statefulSet.yaml +++ b/examples/all/manifests/thanos-store-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/thanos-receive.jsonnet b/examples/thanos-receive.jsonnet index e1019680..8b700388 100644 --- a/examples/thanos-receive.jsonnet +++ b/examples/thanos-receive.jsonnet @@ -7,7 +7,7 @@ t.receive { local tr = self, name:: 'thanos-receive', namespace:: 'observability', - version:: 'master-2020-05-07-b9ff23c5', + version:: 'master-2020-05-18-6cfcb345', image:: 'quay.io/thanos/thanos:v' + tr.version, replicas:: 3, replicationFactor:: 3, diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index be9f8657..1f3a6a82 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -187,6 +187,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; maxChunksGetRangeRequests: 3, chunkObjectSizeTTL: '24h', chunkSubrangeTTL: '24h', + blocksIterTTL: '5m', + metafileExistsTTL: '2h', + metafileDoesntExistTTL: '15m', + metafileContentTTL: '24h', + metafileMaxSize: '1MiB', // Equal to default MaxItemSize in memcached client. }, }, local m = if std.objectHas(ts.config.memcached, 'bucketCache') @@ -210,12 +215,15 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; dns_provider_update_interval: m.dnsProviderUpdateInterval, }, - caching_config: { - chunk_subrange_size: c.chunkSubrangeSize, - max_chunks_get_range_requests: c.maxChunksGetRangeRequests, - chunk_object_size_ttl: c.chunkObjectSizeTTL, - chunk_subrange_ttl: c.chunkSubrangeTTL, - }, + chunk_subrange_size: c.chunkSubrangeSize, + max_chunks_get_range_requests: c.maxChunksGetRangeRequests, + chunk_object_size_ttl: c.chunkObjectSizeTTL, + chunk_subrange_ttl: c.chunkSubrangeTTL, + blocks_iter_ttl: c.blocksIterTTL, + metafile_exists_ttl: c.metafileExistsTTL, + metafile_doesnt_exist_ttl: c.metafileDoesntExistTTL, + metafile_content_ttl: c.metafileContentTTL, + metafile_max_size: m.maxItemSize, }, statefulSet+: { spec+: { diff --git a/manifests/thanos-query-deployment.yaml b/manifests/thanos-query-deployment.yaml index 20e07669..669aa3ce 100644 --- a/manifests/thanos-query-deployment.yaml +++ b/manifests/thanos-query-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-query namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: affinity: podAntiAffinity: @@ -45,7 +45,7 @@ spec: - --query.replica-label=prometheus_replica - --query.replica-label=rule_replica - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 4 httpGet: diff --git a/manifests/thanos-query-service.yaml b/manifests/thanos-query-service.yaml index d0040e2d..8256a64c 100644 --- a/manifests/thanos-query-service.yaml +++ b/manifests/thanos-query-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-query namespace: thanos spec: diff --git a/manifests/thanos-query-serviceMonitor.yaml b/manifests/thanos-query-serviceMonitor.yaml index 17126720..b18d809a 100644 --- a/manifests/thanos-query-serviceMonitor.yaml +++ b/manifests/thanos-query-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-query namespace: thanos spec: diff --git a/manifests/thanos-store-service.yaml b/manifests/thanos-store-service.yaml index be591406..705152cb 100644 --- a/manifests/thanos-store-service.yaml +++ b/manifests/thanos-store-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: diff --git a/manifests/thanos-store-serviceMonitor.yaml b/manifests/thanos-store-serviceMonitor.yaml index eb9340cb..c36c9fa6 100644 --- a/manifests/thanos-store-serviceMonitor.yaml +++ b/manifests/thanos-store-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml index b2368e6b..4fd29628 100644 --- a/manifests/thanos-store-statefulSet.yaml +++ b/manifests/thanos-store-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-07-b9ff23c5 + app.kubernetes.io/version: master-2020-05-18-6cfcb345 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-07-b9ff23c5 + image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 livenessProbe: failureThreshold: 8 httpGet: From ba175b3d45cc2016ec208376a0e7685a12835ba0 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Mon, 18 May 2020 10:26:55 +0200 Subject: [PATCH 6/9] Remove unused default value Signed-off-by: Kemal Akkoyun --- jsonnet/kube-thanos/kube-thanos-store.libsonnet | 1 - 1 file changed, 1 deletion(-) diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index 1f3a6a82..7695ee3e 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -191,7 +191,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; metafileExistsTTL: '2h', metafileDoesntExistTTL: '15m', metafileContentTTL: '24h', - metafileMaxSize: '1MiB', // Equal to default MaxItemSize in memcached client. }, }, local m = if std.objectHas(ts.config.memcached, 'bucketCache') From a4d39468b9f725b8ac78976d717e30f2fe8ee43c Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Tue, 19 May 2020 09:52:01 +0200 Subject: [PATCH 7/9] Update configuration after recent changes Signed-off-by: Kemal Akkoyun --- .../thanos-store-statefulSet-with-memcached.yaml | 12 ++++++------ jsonnet/kube-thanos/kube-thanos-store.libsonnet | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml index 3b47e21c..9bc169b6 100644 --- a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml +++ b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml @@ -46,8 +46,11 @@ spec: "timeout": "500ms" "type": "MEMCACHED" - |- - --store.caching-bucket.config="backend": "memcached" - "backend_config": + --store.caching-bucket.config="blocks_iter_ttl": "5m" + "chunk_object_size_ttl": "24h" + "chunk_subrange_size": 16000 + "chunk_subrange_ttl": "24h" + "config": "addresses": - "dnssrv+_client._tcp..thanos.svc.cluster.local" "dns_provider_update_interval": "10s" @@ -58,15 +61,12 @@ spec: "max_idle_connections": 100 "max_item_size": "1MiB" "timeout": "500ms" - "blocks_iter_ttl": "5m" - "chunk_object_size_ttl": "24h" - "chunk_subrange_size": 16000 - "chunk_subrange_ttl": "24h" "max_chunks_get_range_requests": 3 "metafile_content_ttl": "24h" "metafile_doesnt_exist_ttl": "15m" "metafile_exists_ttl": "2h" "metafile_max_size": "1MiB" + "type": "MEMCACHED" env: - name: OBJSTORE_CONFIG valueFrom: diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index 7695ee3e..b3636b20 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -201,8 +201,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local c = ts.config.bucketCacheConfig, local cfg = { - backend: 'memcached', - backend_config: { + type: 'MEMCACHED', + config: { addresses: m.addresses, timeout: m.timeout, max_idle_connections: m.maxIdleConnections, From cb6f37bae468aa83d0256f54f2434d6239d9cba6 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Wed, 20 May 2020 10:17:53 +0200 Subject: [PATCH 8/9] Omit changes when memcached not specified Signed-off-by: Kemal Akkoyun --- jsonnet/kube-thanos/kube-thanos-store.libsonnet | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index b3636b20..fcfd2d94 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -165,10 +165,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; spec+: { containers: [ if c.name == 'thanos-store' then c { - args+: [ + args+: if m != {} then [ '--experimental.enable-index-cache-postings-compression', '--index-cache.config=' + std.manifestYamlDoc(cfg), - ], + ] else [], } else c for c in super.containers ], @@ -230,9 +230,9 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; spec+: { containers: [ if c.name == 'thanos-store' then c { - args+: [ + args+: if m != {} then [ '--store.caching-bucket.config=' + std.manifestYamlDoc(cfg), - ], + ] else [], } else c for c in super.containers ], From 128e08afe2f8346d3109aa93bd4341191dfe92c9 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Wed, 20 May 2020 10:25:37 +0200 Subject: [PATCH 9/9] Use Thanos v0.13.0-rc.0 Signed-off-by: Kemal Akkoyun --- README.md | 2 +- all.jsonnet | 2 +- example.jsonnet | 2 +- examples/all/manifests/thanos-bucket-deployment.yaml | 6 +++--- examples/all/manifests/thanos-bucket-service.yaml | 2 +- examples/all/manifests/thanos-compact-service.yaml | 2 +- examples/all/manifests/thanos-compact-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-compact-statefulSet.yaml | 6 +++--- examples/all/manifests/thanos-query-deployment.yaml | 6 +++--- examples/all/manifests/thanos-query-service.yaml | 2 +- examples/all/manifests/thanos-query-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-receive-service.yaml | 2 +- examples/all/manifests/thanos-receive-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-receive-statefulSet.yaml | 6 +++--- examples/all/manifests/thanos-rule-service.yaml | 2 +- examples/all/manifests/thanos-rule-serviceMonitor.yaml | 2 +- examples/all/manifests/thanos-rule-statefulSet.yaml | 6 +++--- examples/all/manifests/thanos-store-service.yaml | 2 +- examples/all/manifests/thanos-store-serviceMonitor.yaml | 2 +- .../manifests/thanos-store-statefulSet-with-memcached.yaml | 6 +++--- examples/all/manifests/thanos-store-statefulSet.yaml | 6 +++--- examples/thanos-receive.jsonnet | 2 +- manifests/thanos-query-deployment.yaml | 6 +++--- manifests/thanos-query-service.yaml | 2 +- manifests/thanos-query-serviceMonitor.yaml | 2 +- manifests/thanos-store-service.yaml | 2 +- manifests/thanos-store-serviceMonitor.yaml | 2 +- manifests/thanos-store-statefulSet.yaml | 6 +++--- 28 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index d7d91b39..fdc34f8a 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'master-2020-05-18-6cfcb345', + version: 'v0.13.0-rc.0', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/all.jsonnet b/all.jsonnet index c258ed55..ad4c60e1 100644 --- a/all.jsonnet +++ b/all.jsonnet @@ -7,7 +7,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'master-2020-05-18-6cfcb345', + version: 'v0.13.0-rc.0', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/example.jsonnet b/example.jsonnet index 24083acc..af64882f 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -7,7 +7,7 @@ local commonConfig = { config+:: { local cfg = self, namespace: 'thanos', - version: 'master-2020-05-18-6cfcb345', + version: 'v0.13.0-rc.0', image: 'quay.io/thanos/thanos:' + cfg.version, objectStorageConfig: { name: 'thanos-objectstorage', diff --git a/examples/all/manifests/thanos-bucket-deployment.yaml b/examples/all/manifests/thanos-bucket-deployment.yaml index 1b81ed0c..656ec354 100644 --- a/examples/all/manifests/thanos-bucket-deployment.yaml +++ b/examples/all/manifests/thanos-bucket-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-bucket namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: containers: - args: @@ -34,7 +34,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-bucket-service.yaml b/examples/all/manifests/thanos-bucket-service.yaml index a4007200..dee5b433 100644 --- a/examples/all/manifests/thanos-bucket-service.yaml +++ b/examples/all/manifests/thanos-bucket-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket app.kubernetes.io/name: thanos-bucket - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-bucket namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-service.yaml b/examples/all/manifests/thanos-compact-service.yaml index 1a18b632..1e0304f8 100644 --- a/examples/all/manifests/thanos-compact-service.yaml +++ b/examples/all/manifests/thanos-compact-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-compact namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-serviceMonitor.yaml b/examples/all/manifests/thanos-compact-serviceMonitor.yaml index d0758817..3d792687 100644 --- a/examples/all/manifests/thanos-compact-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-compact-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-compact namespace: thanos spec: diff --git a/examples/all/manifests/thanos-compact-statefulSet.yaml b/examples/all/manifests/thanos-compact-statefulSet.yaml index d8e08a18..3acedbf6 100644 --- a/examples/all/manifests/thanos-compact-statefulSet.yaml +++ b/examples/all/manifests/thanos-compact-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-compact namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact app.kubernetes.io/name: thanos-compact - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-query-deployment.yaml b/examples/all/manifests/thanos-query-deployment.yaml index 646578a8..c1193570 100644 --- a/examples/all/manifests/thanos-query-deployment.yaml +++ b/examples/all/manifests/thanos-query-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-query namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: affinity: podAntiAffinity: @@ -47,7 +47,7 @@ spec: - --store=dnssrv+_grpc._tcp.thanos-receive.thanos.svc.cluster.local - --store=dnssrv+_grpc._tcp.thanos-rule.thanos.svc.cluster.local - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 4 httpGet: diff --git a/examples/all/manifests/thanos-query-service.yaml b/examples/all/manifests/thanos-query-service.yaml index 8256a64c..4b48cdf0 100644 --- a/examples/all/manifests/thanos-query-service.yaml +++ b/examples/all/manifests/thanos-query-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-query namespace: thanos spec: diff --git a/examples/all/manifests/thanos-query-serviceMonitor.yaml b/examples/all/manifests/thanos-query-serviceMonitor.yaml index b18d809a..3782b447 100644 --- a/examples/all/manifests/thanos-query-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-query-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-query namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-service.yaml b/examples/all/manifests/thanos-receive-service.yaml index 327ab24c..bdab7109 100644 --- a/examples/all/manifests/thanos-receive-service.yaml +++ b/examples/all/manifests/thanos-receive-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-receive namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-serviceMonitor.yaml b/examples/all/manifests/thanos-receive-serviceMonitor.yaml index a4824151..bfbbd07c 100644 --- a/examples/all/manifests/thanos-receive-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-receive-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-receive namespace: thanos spec: diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml index ee8d3843..f0343f14 100644 --- a/examples/all/manifests/thanos-receive-statefulSet.yaml +++ b/examples/all/manifests/thanos-receive-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-receive namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive app.kubernetes.io/name: thanos-receive - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: affinity: podAntiAffinity: @@ -75,7 +75,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/all/manifests/thanos-rule-service.yaml b/examples/all/manifests/thanos-rule-service.yaml index 65e6e6ee..8dad2f77 100644 --- a/examples/all/manifests/thanos-rule-service.yaml +++ b/examples/all/manifests/thanos-rule-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-rule namespace: thanos spec: diff --git a/examples/all/manifests/thanos-rule-serviceMonitor.yaml b/examples/all/manifests/thanos-rule-serviceMonitor.yaml index 4370f62b..d8c3b7ac 100644 --- a/examples/all/manifests/thanos-rule-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-rule-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-rule namespace: thanos spec: diff --git a/examples/all/manifests/thanos-rule-statefulSet.yaml b/examples/all/manifests/thanos-rule-statefulSet.yaml index df84f24e..113ebe5e 100644 --- a/examples/all/manifests/thanos-rule-statefulSet.yaml +++ b/examples/all/manifests/thanos-rule-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-rule namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule app.kubernetes.io/name: thanos-rule - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: containers: - args: @@ -44,7 +44,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 24 httpGet: diff --git a/examples/all/manifests/thanos-store-service.yaml b/examples/all/manifests/thanos-store-service.yaml index 705152cb..7f29c178 100644 --- a/examples/all/manifests/thanos-store-service.yaml +++ b/examples/all/manifests/thanos-store-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: diff --git a/examples/all/manifests/thanos-store-serviceMonitor.yaml b/examples/all/manifests/thanos-store-serviceMonitor.yaml index c36c9fa6..e1df176b 100644 --- a/examples/all/manifests/thanos-store-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-store-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: diff --git a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml index 9bc169b6..a92c1fd8 100644 --- a/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml +++ b/examples/all/manifests/thanos-store-statefulSet-with-memcached.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: containers: - args: @@ -73,7 +73,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml index 4fd29628..4cff2b52 100644 --- a/examples/all/manifests/thanos-store-statefulSet.yaml +++ b/examples/all/manifests/thanos-store-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 8 httpGet: diff --git a/examples/thanos-receive.jsonnet b/examples/thanos-receive.jsonnet index 8b700388..0106a0e7 100644 --- a/examples/thanos-receive.jsonnet +++ b/examples/thanos-receive.jsonnet @@ -7,7 +7,7 @@ t.receive { local tr = self, name:: 'thanos-receive', namespace:: 'observability', - version:: 'master-2020-05-18-6cfcb345', + version:: 'v0.13.0-rc.0', image:: 'quay.io/thanos/thanos:v' + tr.version, replicas:: 3, replicationFactor:: 3, diff --git a/manifests/thanos-query-deployment.yaml b/manifests/thanos-query-deployment.yaml index 669aa3ce..403d98eb 100644 --- a/manifests/thanos-query-deployment.yaml +++ b/manifests/thanos-query-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-query namespace: thanos spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: affinity: podAntiAffinity: @@ -45,7 +45,7 @@ spec: - --query.replica-label=prometheus_replica - --query.replica-label=rule_replica - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 4 httpGet: diff --git a/manifests/thanos-query-service.yaml b/manifests/thanos-query-service.yaml index 8256a64c..4b48cdf0 100644 --- a/manifests/thanos-query-service.yaml +++ b/manifests/thanos-query-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-query namespace: thanos spec: diff --git a/manifests/thanos-query-serviceMonitor.yaml b/manifests/thanos-query-serviceMonitor.yaml index b18d809a..3782b447 100644 --- a/manifests/thanos-query-serviceMonitor.yaml +++ b/manifests/thanos-query-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query app.kubernetes.io/name: thanos-query - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-query namespace: thanos spec: diff --git a/manifests/thanos-store-service.yaml b/manifests/thanos-store-service.yaml index 705152cb..7f29c178 100644 --- a/manifests/thanos-store-service.yaml +++ b/manifests/thanos-store-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: diff --git a/manifests/thanos-store-serviceMonitor.yaml b/manifests/thanos-store-serviceMonitor.yaml index c36c9fa6..e1df176b 100644 --- a/manifests/thanos-store-serviceMonitor.yaml +++ b/manifests/thanos-store-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml index 4fd29628..4cff2b52 100644 --- a/manifests/thanos-store-statefulSet.yaml +++ b/manifests/thanos-store-statefulSet.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 name: thanos-store namespace: thanos spec: @@ -22,7 +22,7 @@ spec: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store app.kubernetes.io/name: thanos-store - app.kubernetes.io/version: master-2020-05-18-6cfcb345 + app.kubernetes.io/version: v0.13.0-rc.0 spec: containers: - args: @@ -37,7 +37,7 @@ spec: secretKeyRef: key: thanos.yaml name: thanos-objectstorage - image: quay.io/thanos/thanos:master-2020-05-18-6cfcb345 + image: quay.io/thanos/thanos:v0.13.0-rc.0 livenessProbe: failureThreshold: 8 httpGet: