From f5e566332403bf557fe12d65905eb75ce249fa4f Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Sat, 17 Oct 2020 01:09:58 +0200
Subject: [PATCH] Sync from upstream

---
 templates/grafana/deployment.yaml                  |  2 +-
 .../exporters/kube-state-metrics/cluster-role.yaml | 14 +++++++-------
 .../exporters/kube-state-metrics/deployment.yaml   |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/templates/grafana/deployment.yaml b/templates/grafana/deployment.yaml
index 31f1add..1dcfecd 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.2.0
+          image: docker.io/grafana/grafana:7.2.1
           env:
             - name: GF_PATHS_CONFIG
               value: "/etc/grafana/custom.ini"
diff --git a/templates/prometheus/exporters/kube-state-metrics/cluster-role.yaml b/templates/prometheus/exporters/kube-state-metrics/cluster-role.yaml
index 9346b9a..72c4894 100644
--- a/templates/prometheus/exporters/kube-state-metrics/cluster-role.yaml
+++ b/templates/prometheus/exporters/kube-state-metrics/cluster-role.yaml
@@ -78,13 +78,6 @@ rules:
   verbs:
   - list
   - watch
-- apiGroups:
-  - autoscaling.k8s.io
-  resources:
-  - verticalpodautoscalers
-  verbs:
-  - list
-  - watch
 - apiGroups:
   - admissionregistration.k8s.io
   resources:
@@ -100,4 +93,11 @@ rules:
   verbs:
   - list
   - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - list
+  - watch
 
diff --git a/templates/prometheus/exporters/kube-state-metrics/deployment.yaml b/templates/prometheus/exporters/kube-state-metrics/deployment.yaml
index 6e4660b..f4d48ad 100644
--- a/templates/prometheus/exporters/kube-state-metrics/deployment.yaml
+++ b/templates/prometheus/exporters/kube-state-metrics/deployment.yaml
@@ -25,10 +25,12 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:v1.9.7
+        image: quay.io/coreos/kube-state-metrics:v2.0.0-alpha.1
         ports:
           - name: metrics
             containerPort: 8080
+          - name: telemetry
+            containerPort: 8081
         livenessProbe:
           httpGet:
             path: /healthz
@@ -41,3 +43,5 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           timeoutSeconds: 5
+        securityContext:
+          runAsUser: 65534