From 25ca95707d4b5cdf2eb0be809fa59611e6882972 Mon Sep 17 00:00:00 2001
From: Mattias Gees <mattias.gees@gmail.com>
Date: Thu, 21 Feb 2019 10:32:19 +0000
Subject: [PATCH 1/2] Update kube-state-metrics to the latest version

Signed-off-by: Mattias Gees <mattias.gees@gmail.com>
---
 .../prometheus/manifests/kube_state_metrics.pp      |  2 +-
 .../kube-state-metrics-deployment.yaml.erb          | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/puppet/modules/prometheus/manifests/kube_state_metrics.pp b/puppet/modules/prometheus/manifests/kube_state_metrics.pp
index 4c49916484..3059733ecd 100644
--- a/puppet/modules/prometheus/manifests/kube_state_metrics.pp
+++ b/puppet/modules/prometheus/manifests/kube_state_metrics.pp
@@ -1,6 +1,6 @@
 class prometheus::kube_state_metrics (
   String $image = 'gcr.io/google_containers/kube-state-metrics',
-  String $version = '1.4.0',
+  String $version = '1.5.0',
   String $resizer_image = 'gcr.io/google_containers/addon-resizer',
   String $resizer_version = '1.8.4',
 ){
diff --git a/puppet/modules/prometheus/templates/kube-state-metrics-deployment.yaml.erb b/puppet/modules/prometheus/templates/kube-state-metrics-deployment.yaml.erb
index 82375529e0..cf1ec6adad 100644
--- a/puppet/modules/prometheus/templates/kube-state-metrics-deployment.yaml.erb
+++ b/puppet/modules/prometheus/templates/kube-state-metrics-deployment.yaml.erb
@@ -117,9 +117,13 @@ rules:
   - daemonsets
   - deployments
   - replicasets
+  - ingresses
   verbs: ["list", "watch"]
 - apiGroups: ["apps"]
   resources:
+  - daemonsets
+  - deployments
+  - replicasets
   - statefulsets
   verbs: ["list", "watch"]
 - apiGroups: ["batch"]
@@ -131,6 +135,10 @@ rules:
   resources:
   - horizontalpodautoscalers
   verbs: ["list", "watch"]
+- apiGroups: ["policy"]
+  resources:
+  - poddisruptionbudgets
+  verbs: ["list", "watch"]
 ---
 <%- if @version_before_1_6 -%>
 apiVersion: rbac.authorization.k8s.io/v1alpha1
@@ -168,6 +176,11 @@ rules:
   resources:
   - pods
   verbs: ["get"]
+- apiGroups: ["apps"]
+  resources:
+  - deployments
+  resourceNames: ["kube-state-metrics"]
+  verbs: ["get", "update"]
 - apiGroups: ["extensions"]
   resources:
   - deployments

From b3de0f06a44ca5ca45685a63e7cdd0b05cf55e79 Mon Sep 17 00:00:00 2001
From: Christian Simon <simon@swine.de>
Date: Tue, 4 Jun 2019 11:27:07 +0100
Subject: [PATCH 2/2] Upgrade kube-state-metrics to 1.6.0

Signed-off-by: Christian Simon <simon@swine.de>
---
 puppet/modules/prometheus/manifests/kube_state_metrics.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/modules/prometheus/manifests/kube_state_metrics.pp b/puppet/modules/prometheus/manifests/kube_state_metrics.pp
index 3059733ecd..0f8b27fd79 100644
--- a/puppet/modules/prometheus/manifests/kube_state_metrics.pp
+++ b/puppet/modules/prometheus/manifests/kube_state_metrics.pp
@@ -1,6 +1,6 @@
 class prometheus::kube_state_metrics (
   String $image = 'gcr.io/google_containers/kube-state-metrics',
-  String $version = '1.5.0',
+  String $version = '1.6.0',
   String $resizer_image = 'gcr.io/google_containers/addon-resizer',
   String $resizer_version = '1.8.4',
 ){