From f53ac2a5a09840f66f0ca8f5a2b34cfe8327a5ff Mon Sep 17 00:00:00 2001
From: Joel Seguillon <joel.seguillon@gmail.com>
Date: Fri, 13 Mar 2020 14:46:40 +0100
Subject: [PATCH] Update metrics addon for 1.16  (#5706)

* upgrade metrics server and resizer images version

* scope "apps" api group for addon resizer
---
 roles/download/defaults/main.yml                              | 4 ++--
 .../metrics_server/templates/resource-reader.yaml.j2          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index d2cbceef4..d3baec0f1 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -439,7 +439,7 @@ registry_image_repo: "{{ docker_image_repo }}/library/registry"
 registry_image_tag: "2.6"
 registry_proxy_image_repo: "{{ gcr_image_repo }}/google_containers/kube-registry-proxy"
 registry_proxy_image_tag: "0.4"
-metrics_server_version: "v0.3.3"
+metrics_server_version: "v0.3.6"
 metrics_server_image_repo: "{{ gcr_image_repo }}/google_containers/metrics-server-amd64"
 metrics_server_image_tag: "{{ metrics_server_version }}"
 local_volume_provisioner_image_repo: "{{ quay_image_repo }}/external_storage/local-volume-provisioner"
@@ -455,7 +455,7 @@ ingress_nginx_controller_image_tag: "0.28.0"
 cert_manager_version: "v0.11.0"
 cert_manager_controller_image_repo: "{{ quay_image_repo }}/jetstack/cert-manager-controller"
 cert_manager_controller_image_tag: "{{ cert_manager_version }}"
-addon_resizer_version: "1.8.3"
+addon_resizer_version: "1.8.8"
 addon_resizer_image_repo: "{{ kube_image_repo }}/addon-resizer"
 addon_resizer_image_tag: "{{ addon_resizer_version }}"
 
diff --git a/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
index 221fb1fd0..f457eb6a1 100644
--- a/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
@@ -18,7 +18,7 @@ rules:
   - list
   - watch
 - apiGroups:
-  - "extensions"
+  - "apps"
   resources:
   - deployments
   verbs:
-- 
GitLab