From b493c81ce87a52752408ca0e6a1409e49619cca8 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Tue, 19 Jan 2021 14:45:44 +0100
Subject: [PATCH] Update metrics-server to 0.4.1 (#7188)

---
 roles/download/defaults/main.yml                  |  2 +-
 .../templates/metrics-server-deployment.yaml.j2   | 15 +++++++--------
 .../templates/metrics-server-service.yaml.j2      |  3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 163d0656e..f5da583d4 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -475,7 +475,7 @@ registry_image_repo: "{{ docker_image_repo }}/library/registry"
 registry_image_tag: "2.7.1"
 registry_proxy_image_repo: "{{ kube_image_repo }}/kube-registry-proxy"
 registry_proxy_image_tag: "0.4"
-metrics_server_version: "v0.3.7"
+metrics_server_version: "v0.4.1"
 metrics_server_image_repo: "{{ kube_image_repo }}/metrics-server/metrics-server"
 metrics_server_image_tag: "{{ metrics_server_version }}"
 local_volume_provisioner_image_repo: "{{ quay_image_repo }}/external_storage/local-volume-provisioner"
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
index c4b698d6c..d636d6ad9 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@@ -36,10 +36,15 @@ spec:
 {% if metrics_server_kubelet_preferred_address_types %}
         - --kubelet-preferred-address-types={{ metrics_server_kubelet_preferred_address_types }}
 {% endif %}
+        - --kubelet-use-node-status-port
 {% if metrics_server_kubelet_insecure_tls %}
         - --kubelet-insecure-tls
 {% endif %}
         - --metric-resolution={{ metrics_server_metric_resolution }}
+        resources:
+          requests:
+            cpu: 100m
+            memory: 300Mi
         ports:
         - containerPort: 8443
           name: https
@@ -49,21 +54,15 @@ spec:
           mountPath: /tmp
         livenessProbe:
           httpGet:
-            path: /healthz
+            path: /healthz?exclude=readyz
             port: https
             scheme: HTTPS
-          successThreshold: 1
-          initialDelaySeconds: 20
-          failureThreshold: 3
           timeoutSeconds: 10
         readinessProbe:
           httpGet:
-            path: /healthz
+            path: /healthz?exclude=livez
             port: https
             scheme: HTTPS
-          successThreshold: 1
-          initialDelaySeconds: 20
-          failureThreshold: 3
           timeoutSeconds: 10
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2
index 9af0aa214..50b114b70 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2
@@ -10,6 +10,7 @@ spec:
   selector:
     app.kubernetes.io/name: metrics-server
   ports:
-  - port: 443
+  - name: https
+    port: 443
     protocol: TCP
     targetPort: https