From 9d4cdb7b0280f95d473cf505917ce5a8aba7e797 Mon Sep 17 00:00:00 2001 From: zhengtianbao Date: Mon, 1 Nov 2021 23:21:19 +0800 Subject: [PATCH] Ensure addon-resizer 1.8.11 only effective at arch amd64. (#8144) * Ensure addon-resizer 1.8.11 only effective at arch amd64. k8s.gcr.io/addon-resizer:1.8.11 returns the amd64 image which is not executable at arm64. Disable addon-resizer when the platform is not amd64. When metrics-server upgrade and use addon-resizer:2.3, then revert this commit and `image_arch` will determine the `addon_resizer_image_tag`. * Add metrics_server_resizer architectures check --- roles/kubernetes-apps/metrics_server/defaults/main.yml | 1 + roles/kubernetes-apps/metrics_server/tasks/main.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/roles/kubernetes-apps/metrics_server/defaults/main.yml b/roles/kubernetes-apps/metrics_server/defaults/main.yml index 4ef20fe6a..07a7b227a 100644 --- a/roles/kubernetes-apps/metrics_server/defaults/main.yml +++ b/roles/kubernetes-apps/metrics_server/defaults/main.yml @@ -1,4 +1,5 @@ --- +# metrics_server_resizer only effective in arch amd64 metrics_server_resizer: false metrics_server_kubelet_insecure_tls: true metrics_server_kubelet_preferred_address_types: "InternalIP" diff --git a/roles/kubernetes-apps/metrics_server/tasks/main.yml b/roles/kubernetes-apps/metrics_server/tasks/main.yml index fdc9fc1e9..d836f2032 100644 --- a/roles/kubernetes-apps/metrics_server/tasks/main.yml +++ b/roles/kubernetes-apps/metrics_server/tasks/main.yml @@ -4,6 +4,12 @@ set_fact: masters_are_not_tainted: "{{ groups['kube_node'] | intersect(groups['kube_control_plane']) == groups['kube_control_plane'] }}" +- name: check host_architecture is amd64 for metrics_server_resizer + assert: + that: host_architecture == "amd64" + msg: "metrics_server_resizer is not available on other architectures than amd64" + when: metrics_server_resizer + - name: Metrics Server | Delete addon dir file: path: "{{ kube_config_dir }}/addons/metrics_server"