From c5aead020b659b72dd022b919a95ed9d5174a507 Mon Sep 17 00:00:00 2001
From: Antonio Ojea <aojea@redhat.com>
Date: Thu, 15 Jul 2021 13:51:28 +0200
Subject: [PATCH 1/2] cluster: fix CI metrics-server deployment

use deployment based on upstream manifest

- add liveness and readiness probes
- use kubelet port secure port

https://github.com/kubernetes-sigs/metrics-server/blob/release-0.4/manifests/base/deployment.yaml#L32-L38
---
 .../metrics-server-deployment.yaml            | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml
index aba5368a067..d7f44e080d5 100644
--- a/cluster/addons/metrics-server/metrics-server-deployment.yaml
+++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml
@@ -54,10 +54,8 @@ spec:
         command:
         - /metrics-server
         - --metric-resolution=30s
-        # These are needed for GKE, which doesn't support secure communication yet.
-        # Remove these lines for non-GKE clusters, and when GKE supports token-based auth.
-        - --kubelet-port=10255
-        - --deprecated-kubelet-completely-insecure=true
+        - --kubelet-use-node-status-port
+        - --kubelet-insecure-tls
         - --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
         - --cert-dir=/tmp
         - --secure-port=443
@@ -65,6 +63,20 @@ spec:
         - containerPort: 443
           name: https
           protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: https
+            scheme: HTTPS
+          periodSeconds: 10
+          failureThreshold: 3
+        livenessProbe:
+          httpGet:
+            path: /livez
+            port: https
+            scheme: HTTPS
+          periodSeconds: 10
+          failureThreshold: 3
         volumeMounts:
         - mountPath: /tmp
           name: tmp-dir

From 0610968bfaa8b6448d884f67c1faf3700bce62ef Mon Sep 17 00:00:00 2001
From: Antonio Ojea <aojea@redhat.com>
Date: Thu, 22 Jul 2021 01:13:44 +0200
Subject: [PATCH 2/2] bump metrics-server to 0.5.0

---
 .../metrics-server/metrics-server-deployment.yaml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml
index d7f44e080d5..60af149cb9a 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.4.4
+  name: metrics-server-v0.5.0
   namespace: kube-system
   labels:
     k8s-app: metrics-server
     addonmanager.kubernetes.io/mode: Reconcile
-    version: v0.4.4
+    version: v0.5.0
 spec:
   selector:
     matchLabels:
       k8s-app: metrics-server
-      version: v0.4.4
+      version: v0.5.0
   template:
     metadata:
       name: metrics-server
       labels:
         k8s-app: metrics-server
-        version: v0.4.4
+        version: v0.5.0
     spec:
       securityContext:
         seccompProfile:
@@ -50,7 +50,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: metrics-server
-        image: k8s.gcr.io/metrics-server/metrics-server:v0.4.4
+        image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0
         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.4.4
+          - --deployment=metrics-server-v0.5.0
           - --container=metrics-server
           - --poll-period=30000
           - --estimator=exponential