From fcf7a2fcbf76ba4c041901c5bf9944ec040c1390 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Thu, 23 Jul 2020 17:06:48 +0200
Subject: [PATCH 1/2] jsonnet: update component versions

---
 .../kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet    | 2 +-
 jsonnet/kube-prometheus/kube-prometheus.libsonnet               | 2 +-
 jsonnet/kube-prometheus/prometheus/prometheus.libsonnet         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
index 5d675c79..72dca33c 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
@@ -5,7 +5,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
 {
   _config+:: {
     versions+:: {
-      thanos: 'v0.10.0',
+      thanos: 'v0.14.0',
     },
     imageRepos+:: {
       thanos: 'quay.io/thanos/thanos',
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index b787e48f..3f65dae8 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -104,7 +104,7 @@ local configMapList = k3.core.v1.configMapList;
     namespace: 'default',
 
     versions+:: {
-      grafana: '6.7.4',
+      grafana: '7.1.0',
     },
 
     tlsCipherSuites: [
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index bd128d2e..e4673f50 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -6,7 +6,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     namespace: 'default',
 
     versions+:: {
-      prometheus: 'v2.19.2',
+      prometheus: 'v2.20.0',
     },
 
     imageRepos+:: {

From a9ffdaa35c5a3d91bdb22d8138455faefda9d8fd Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Thu, 23 Jul 2020 18:04:56 +0200
Subject: [PATCH 2/2] manifests: regenerate

---
 manifests/grafana-deployment.yaml    | 2 +-
 manifests/prometheus-prometheus.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 491eb061..d4cc0f92 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - env: []
-        image: grafana/grafana:6.7.4
+        image: grafana/grafana:7.1.0
         name: grafana
         ports:
         - containerPort: 3000
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 11a4c5d3..af520a82 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -11,7 +11,7 @@ spec:
     - name: alertmanager-main
       namespace: monitoring
       port: web
-  image: quay.io/prometheus/prometheus:v2.19.2
+  image: quay.io/prometheus/prometheus:v2.20.0
   nodeSelector:
     kubernetes.io/os: linux
   podMonitorNamespaceSelector: {}
@@ -31,4 +31,4 @@ spec:
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
-  version: v2.19.2
+  version: v2.20.0