Reverting helm changes which were included in Cortex 1.0 vendor upgra…

…de because it resulted in us pushing an unstable helm.
tathougies · Apr 15, 2020 · 3fb316e · 3fb316e
1 parent fee58f1
commit 3fb316e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1"
 name: loki-stack
-version: 0.35.0
-appVersion: v1.4.2
+version: 0.36.0
+appVersion: v1.4.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
 home: https://grafana.com/loki

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1"
 name: loki
-version: 0.27.0
-appVersion: v1.4.2
+version: 0.28.0
+appVersion: v1.4.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
 home: https://grafana.com/loki

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: grafana/loki
-  tag: keepalive-master-6d5408c
+  tag: 1.4.1
   pullPolicy: IfNotPresent
 
   ## Optionally specify an array of imagePullSecrets.
@@ -63,8 +63,8 @@ config:
       #   consul:
       #     host: "consul:8500"
       #     prefix: ""
-      #     http_client_timeout: "20s"
-      #     consistent_reads: true
+      #     httpclienttimeout: "20s"
+      #     consistentreads: true
   limits_config:
     enforce_metric_name: false
     reject_old_samples: true

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1"
 name: promtail
-version: 0.21.0
-appVersion: v1.4.2
+version: 0.22.0
+appVersion: v1.4.1
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"
 home: https://grafana.com/loki

diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
@@ -17,7 +17,7 @@ initContainer:
 
 image:
   repository: grafana/promtail
-  tag: keepalive-master-6d5408c
+  tag: 1.4.1
   pullPolicy: IfNotPresent
 
 livenessProbe: {}
@@ -127,11 +127,11 @@ config:
 
     backoff_config:
       # Initial backoff time between retries
-      min_period: 100ms
+      minbackoff: 100ms
       # Maximum backoff time between retries
-      max_period: 5s
+      maxbackoff: 5s
       # Maximum number of retries when sending batches, 0 means infinite retries
-      max_retries: 20
+      maxretries: 20
 
     # The labels to add to any time series or alerts when communicating with loki
     external_labels: {}