From ae2aea143863a13a36f4e357012228fd22abb371 Mon Sep 17 00:00:00 2001 From: atsikham Date: Fri, 22 Oct 2021 00:15:15 +0200 Subject: [PATCH] Moved k8s dashboard upgrade once again --- .../playbooks/roles/upgrade/tasks/kubernetes.yml | 9 --------- ansible/playbooks/upgrade.yml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml b/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml index 4c79ac7c75..36f0b82542 100644 --- a/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml +++ b/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml @@ -30,15 +30,6 @@ when: - inventory_hostname in groups.kubernetes_master[1:] - # K8s dashboard upgraded only after control plane upgrade - # Otherwise there can be issues, such as hitting not upgraded apiserver by controller manager - # which results to forever terminating namespace after deletion - - name: k8s | Upgrade Kubernetes Dashboard - include_tasks: kubernetes/upgrade-k8s-dashboard.yml - when: - - upgrade_to_final_version - - inventory_hostname == groups.kubernetes_master[0] - - name: Upgrade nodes when: kubelet_version is version('v' + version, '<=') block: diff --git a/ansible/playbooks/upgrade.yml b/ansible/playbooks/upgrade.yml index f0b7ded6c8..aaf9c0ad96 100644 --- a/ansible/playbooks/upgrade.yml +++ b/ansible/playbooks/upgrade.yml @@ -60,6 +60,21 @@ environment: KUBECONFIG: "{{ kubeconfig.remote }}" +# K8s dashboard upgraded only after control plane upgrade +# Otherwise there can be issues, such as hitting not upgraded apiserver by controller manager +# which results to forever terminating namespace after deletion +- hosts: kubernetes_master + become: true + become_method: sudo + tasks: + - include_role: + name: upgrade + tasks_from: kubernetes/upgrade-k8s-dashboard + run_once: true + when: "'kubernetes' in upgrade_components or upgrade_components|length == 0" + environment: + KUBECONFIG: "{{ kubeconfig.remote }}" + - hosts: elasticsearch_curator become: true become_method: sudo