From 3f75f69e95f4dfd8486814d2340190bea4cb92b3 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Wed, 24 Mar 2021 22:21:30 +0100
Subject: [PATCH] Update from upstream

---
 templates/grafana/deployment.yaml                               | 2 +-
 templates/prometheus/deployment.yaml                            | 2 +-
 .../prometheus/exporters/kube-state-metrics/deployment.yaml     | 2 +-
 templates/prometheus/exporters/node-exporter/daemonset.yaml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/grafana/deployment.yaml b/templates/grafana/deployment.yaml
index a572f06..0b2fde0 100644
--- a/templates/grafana/deployment.yaml
+++ b/templates/grafana/deployment.yaml
@@ -24,7 +24,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: grafana
-          image: docker.io/grafana/grafana:7.3.7
+          image: docker.io/grafana/grafana:7.4.5
           env:
             - name: GF_PATHS_CONFIG
               value: "/etc/grafana/custom.ini"
diff --git a/templates/prometheus/deployment.yaml b/templates/prometheus/deployment.yaml
index c330438..530861d 100644
--- a/templates/prometheus/deployment.yaml
+++ b/templates/prometheus/deployment.yaml
@@ -21,7 +21,7 @@ spec:
       serviceAccountName: prometheus
       containers:
         - name: prometheus
-          image: quay.io/prometheus/prometheus:v2.24.0
+          image: quay.io/prometheus/prometheus:v2.25.2
           args:
             - --web.listen-address=0.0.0.0:9090
             - --config.file=/etc/prometheus/prometheus.yaml
diff --git a/templates/prometheus/exporters/kube-state-metrics/deployment.yaml b/templates/prometheus/exporters/kube-state-metrics/deployment.yaml
index 612b9ad..6151e69 100644
--- a/templates/prometheus/exporters/kube-state-metrics/deployment.yaml
+++ b/templates/prometheus/exporters/kube-state-metrics/deployment.yaml
@@ -25,7 +25,7 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:v2.0.0-alpha.3
+        image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.0
         ports:
           - name: metrics
             containerPort: 8080
diff --git a/templates/prometheus/exporters/node-exporter/daemonset.yaml b/templates/prometheus/exporters/node-exporter/daemonset.yaml
index b11fa5c..c54ef65 100644
--- a/templates/prometheus/exporters/node-exporter/daemonset.yaml
+++ b/templates/prometheus/exporters/node-exporter/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       hostPID: true
       containers:
       - name: node-exporter
-        image: quay.io/prometheus/node-exporter:v1.0.1
+        image: quay.io/prometheus/node-exporter:v1.1.2
         args:
           - --path.procfs=/host/proc
           - --path.sysfs=/host/sys