From bc3da94f1abb06ef06df3c8eadfa4285003a1ac9 Mon Sep 17 00:00:00 2001
From: Robert Fratto <robert.fratto@grafana.com>
Date: Mon, 9 Dec 2019 11:27:48 -0500
Subject: [PATCH] v1.2.0: update helm and ksonnet (#1389)

---
 production/helm/loki-stack/Chart.yaml           | 4 ++--
 production/helm/loki/Chart.yaml                 | 4 ++--
 production/helm/loki/values.yaml                | 2 +-
 production/helm/promtail/Chart.yaml             | 4 ++--
 production/helm/promtail/values.yaml            | 2 +-
 production/ksonnet/loki-canary/config.libsonnet | 2 +-
 production/ksonnet/loki/images.libsonnet        | 2 +-
 production/ksonnet/promtail/config.libsonnet    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index e74f13aa2b..3bbe243e8e 100644
--- 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.22.0
-appVersion: v1.1.0
+version: 0.23.0
+appVersion: v1.2.0
 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
index cfba450ed1..81f5ea6c1c 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1"
 name: loki
-version: 0.20.0
-appVersion: v1.1.0
+version: 0.21.0
+appVersion: v1.2.0
 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
index 3915ea9b23..8bfc435dde 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -67,7 +67,7 @@ config:
 
 image:
   repository: grafana/loki
-  tag: v1.1.0
+  tag: v1.2.0
   pullPolicy: IfNotPresent
 
 ## Additional Loki container arguments, e.g. log level (debug, info, warn, error)
diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
index 067e71e28e..c3deb35597 100644
--- a/production/helm/promtail/Chart.yaml
+++ b/production/helm/promtail/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1"
 name: promtail
-version: 0.15.0
-appVersion: v1.1.0
+version: 0.16.0
+appVersion: v1.2.0
 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
index c8e3537424..c66139726b 100644
--- a/production/helm/promtail/values.yaml
+++ b/production/helm/promtail/values.yaml
@@ -8,7 +8,7 @@ deploymentStrategy: RollingUpdate
 
 image:
   repository: grafana/promtail
-  tag: v1.1.0
+  tag: v1.2.0
   pullPolicy: IfNotPresent
 
 livenessProbe: {}
diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet
index 6b0263c0fa..08f31b533d 100644
--- a/production/ksonnet/loki-canary/config.libsonnet
+++ b/production/ksonnet/loki-canary/config.libsonnet
@@ -1,5 +1,5 @@
 {
   _images+:: {
-    loki_canary: 'grafana/loki-canary:v1.1.0',
+    loki_canary: 'grafana/loki-canary:v1.2.0',
   },
 }
diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet
index ccc8929de4..271b7c8b11 100644
--- a/production/ksonnet/loki/images.libsonnet
+++ b/production/ksonnet/loki/images.libsonnet
@@ -4,7 +4,7 @@
     memcached: 'memcached:1.5.17-alpine',
     memcachedExporter: 'prom/memcached-exporter:v0.6.0',
 
-    loki: 'grafana/loki:v1.1.0',
+    loki: 'grafana/loki:v1.2.0',
 
     distributor: self.loki,
     ingester: self.loki,
diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet
index 2cf7188428..a043fe51d6 100644
--- a/production/ksonnet/promtail/config.libsonnet
+++ b/production/ksonnet/promtail/config.libsonnet
@@ -1,6 +1,6 @@
 {
   _images+:: {
-    promtail: 'grafana/promtail:v1.1.0',
+    promtail: 'grafana/promtail:v1.2.0',
   },
 
   _config+:: {