From eba18d503cc6aa831ac914677af163dceb779782 Mon Sep 17 00:00:00 2001
From: Damien Grisonnet <dgrisonn@redhat.com>
Date: Wed, 5 Apr 2023 19:58:38 +0200
Subject: [PATCH] cluster/addons: bump metrics-server to v0.6.3

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
---
 .../metrics-server-deployment.yaml            | 12 +++---
 .../metrics-server/resource-reader.yaml       | 38 +++++++------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml
index c756c405445..4b14eb52600 100644
--- a/cluster/addons/metrics-server/metrics-server-deployment.yaml
+++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml
@@ -23,23 +23,23 @@ data:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: metrics-server-v0.5.2
+  name: metrics-server-v0.6.3
   namespace: kube-system
   labels:
     k8s-app: metrics-server
     addonmanager.kubernetes.io/mode: Reconcile
-    version: v0.5.2
+    version: v0.6.3
 spec:
   selector:
     matchLabels:
       k8s-app: metrics-server
-      version: v0.5.2
+      version: v0.6.3
   template:
     metadata:
       name: metrics-server
       labels:
         k8s-app: metrics-server
-        version: v0.5.2
+        version: v0.6.3
     spec:
       securityContext:
         seccompProfile:
@@ -50,7 +50,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: metrics-server
-        image: registry.k8s.io/metrics-server/metrics-server:v0.5.2
+        image: registry.k8s.io/metrics-server/metrics-server:v0.6.3
         command:
         - /metrics-server
         - --metric-resolution=30s
@@ -109,7 +109,7 @@ spec:
           - --memory={{ base_metrics_server_memory }}
           - --extra-memory={{ metrics_server_memory_per_node }}Mi
           - --threshold=5
-          - --deployment=metrics-server-v0.5.2
+          - --deployment=metrics-server-v0.6.3
           - --container=metrics-server
           - --poll-period=30000
           - --estimator=exponential
diff --git a/cluster/addons/metrics-server/resource-reader.yaml b/cluster/addons/metrics-server/resource-reader.yaml
index 90b6c2dbab9..a3788cb52f1 100644
--- a/cluster/addons/metrics-server/resource-reader.yaml
+++ b/cluster/addons/metrics-server/resource-reader.yaml
@@ -6,31 +6,19 @@ metadata:
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  - nodes
-  - nodes/stats
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - "apps"
-  resources:
-  - deployments
-  verbs:
-  - get
-  - list
-  - update
-  - watch
-  - patch
-- nonResourceURLs:
-  - /metrics
-  verbs:
-  - get
+  - apiGroups: [""]
+    resources:
+      - nodes/metrics
+    verbs:
+      - get
+  - apiGroups: [""]
+    resources:
+      - pods
+      - nodes
+    verbs:
+      - get
+      - list
+      - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding