Tablemanager, typos, more values

Enabled tablemanager deployment again for all storage backends. Typos in deployments regarding loki config. Added retention period to be configured for indexes.
Whyeasy · Apr 6, 2020 · 76e18fb · 76e18fb
1 parent bec5660
commit 76e18fb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/charts/distributed-loki/Chart.yaml b/charts/distributed-loki/Chart.yaml
@@ -3,5 +3,5 @@ name: loki-distributed
 description: A Helm chart for Kubernetes
 type: application
 
-version: 0.0.4
+version: 0.0.5
 appVersion: 1.4.0
diff --git a/charts/distributed-loki/templates/config/loki-cm.yaml b/charts/distributed-loki/templates/config/loki-cm.yaml
@@ -10,7 +10,7 @@ data:
                 consistent_hash: true
                 host: {{ include "loki-helm.memcached" . }}.{{ .Release.Namespace }}.svc.cluster.local
                 service: memcached-client
-        max_look_back_period: 0
+        max_look_back_period: {{ .Values.storage.config.retentionPeriod }}
         write_dedupe_cache_config:
             memcached:
                 batch_size: 100
@@ -118,8 +118,7 @@ data:
             memcached_client:
                 consistent_hash: true
                 host: {{ include "loki-helm.memcached-index-queries" . }}.{{ .Release.Namespace }}.svc.cluster.local
-                service: memcached-client
-    {{ if eq .Values.storage.store "aws-dynamo" }}            
+                service: memcached-client         
     table_manager:
         chunk_tables_provisioning:
             inactive_read_throughput: 0
@@ -131,9 +130,8 @@ data:
             inactive_write_throughput: 0
             provisioned_read_throughput: 0
             provisioned_write_throughput: 0
-        retention_deletes_enabled: false
-        retention_period: 0
-    {{ end }}
+        retention_deletes_enabled: {{ .Values.storage.config.retentionDelete }}
+        retention_period: {{ .Values.storage.config.retentionPeriod }}
 kind: ConfigMap
 metadata:
   name: {{ include "loki-helm.fullname" . }}-config

diff --git a/charts/distributed-loki/templates/distributor/distributor-dpl.yaml b/charts/distributed-loki/templates/distributor/distributor-dpl.yaml
@@ -55,7 +55,7 @@ spec:
           name: overrides
       volumes:
       - configMap:
-          name: {{ include "loki-helm.fullname" . }}-loki
+          name: {{ include "loki-helm.fullname" . }}-config
         name: loki
       - configMap:
           name: {{ include "loki-helm.fullname" . }}-overrides

diff --git a/charts/distributed-loki/templates/ingester/ingester-dpl.yaml b/charts/distributed-loki/templates/ingester/ingester-dpl.yaml
@@ -60,7 +60,7 @@ spec:
       terminationGracePeriodSeconds: 4800
       volumes:
       - configMap:
-          name: {{ include "loki-helm.fullname" . }}-loki
+          name: {{ include "loki-helm.fullname" . }}-config
         name: loki
       - configMap:
           name: {{ include "loki-helm.fullname" . }}-overrides

diff --git a/charts/distributed-loki/templates/querier-frontend/querier-frontend-dpl.yaml b/charts/distributed-loki/templates/querier-frontend/querier-frontend-dpl.yaml
@@ -50,7 +50,7 @@ spec:
           name: overrides
       volumes:
       - configMap:
-          name: {{ include "loki-helm.fullname" . }}-loki
+          name: {{ include "loki-helm.fullname" . }}-config
         name: loki
       - configMap:
           name: {{ include "loki-helm.fullname" . }}-overrides

diff --git a/charts/distributed-loki/templates/querier/querier-dpl.yaml b/charts/distributed-loki/templates/querier/querier-dpl.yaml
@@ -55,7 +55,7 @@ spec:
           name: overrides
       volumes:
       - configMap:
-          name: {{ include "loki-helm.fullname" . }}-loki
+          name: {{ include "loki-helm.fullname" . }}-config
         name: loki
       - configMap:
           name: {{ include "loki-helm.fullname" . }}-overrides

diff --git a/charts/distributed-loki/templates/table-manager/table-manager-dpl.yaml b/charts/distributed-loki/templates/table-manager/table-manager-dpl.yaml
@@ -1,4 +1,3 @@
-{{ if eq .Values.storage.store "aws-dynamo" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -47,6 +46,5 @@ spec:
           name: loki
       volumes:
       - configMap:
-          name: {{ include "loki-helm.fullname" . }}-loki
-        name: loki
-{{ end }}
+          name: {{ include "loki-helm.fullname" . }}-config
+        name: loki
diff --git a/charts/distributed-loki/values.yaml b/charts/distributed-loki/values.yaml
@@ -156,6 +156,10 @@ storage:
   # storage.objectstore -- Type of store to use for your chunks. Currently only gcs is supported.
   objectStore: gcs
   config:
+    # storage.config.retentionPeriod -- Retention period of storing logs.
+    retentionPeriod: 0
+    # storage.config.retentionDelete -- Enable the deletion of indexes.
+    retentionDelete: false
     # storage.config.storeUrl -- Url of your cassandra instance.
     storeUrl: loki-cassandra.monitoring.svc
     # storage.config.bucketName -- Name of your gcs bucket.