From 5372e3617e255872ad5d30e77474ee157c2e757b Mon Sep 17 00:00:00 2001
From: Jon Stelly <967068+jonstelly@users.noreply.github.com>
Date: Sun, 23 May 2021 23:15:55 -0500
Subject: [PATCH] Bump prometheus and kube-state-metrics (#2846)

- Support for running kube-state-metrics on all architectures
- Bump prometheus for security vuln. fix

Signed-off-by: Jon Stelly <967068+jonstelly@users.noreply.github.com>
---
 .../resources/03-statefulset.yml.hb                    |  2 +-
 .../resources/14-kube-state-metrics-deployment.yml.hb  | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/extensions/metrics-cluster-feature/resources/03-statefulset.yml.hb b/extensions/metrics-cluster-feature/resources/03-statefulset.yml.hb
index ee68619a30..cc177204a3 100644
--- a/extensions/metrics-cluster-feature/resources/03-statefulset.yml.hb
+++ b/extensions/metrics-cluster-feature/resources/03-statefulset.yml.hb
@@ -54,7 +54,7 @@ spec:
               mountPath: /var/lib/prometheus
       containers:
         - name: prometheus
-          image: quay.io/prometheus/prometheus:v2.26.0
+          image: quay.io/prometheus/prometheus:v2.27.1
           args:
             - --web.listen-address=0.0.0.0:9090
             - --config.file=/etc/prometheus/prometheus.yaml
diff --git a/extensions/metrics-cluster-feature/resources/14-kube-state-metrics-deployment.yml.hb b/extensions/metrics-cluster-feature/resources/14-kube-state-metrics-deployment.yml.hb
index c895c9831c..5eaefe2cf9 100644
--- a/extensions/metrics-cluster-feature/resources/14-kube-state-metrics-deployment.yml.hb
+++ b/extensions/metrics-cluster-feature/resources/14-kube-state-metrics-deployment.yml.hb
@@ -23,23 +23,15 @@ spec:
                   operator: In
                   values:
                   - linux
-                - key: kubernetes.io/arch
-                  operator: In
-                  values:
-                  - amd64
               - matchExpressions:
                 - key: beta.kubernetes.io/os
                   operator: In
                   values:
                   - linux
-                - key: beta.kubernetes.io/arch
-                  operator: In
-                  values:
-                  - amd64
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:v1.9.8
+        image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0
         ports:
         - name: metrics
           containerPort: 8080