Moved k8s dashboard upgrade once again

hitachienergy · Oct 21, 2021 · 9b4a555 · 9b4a555
1 parent 79d2aba
commit 9b4a555
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -60,6 +60,20 @@
   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[0]
+  become: true
+  become_method: sudo
+  tasks:
+    - import_role:
+        name: upgrade
+        tasks_from: kubernetes/upgrade-k8s-dashboard
+      when: "'kubernetes' in upgrade_components or upgrade_components|length == 0"
+  environment:
+    KUBECONFIG: "{{ kubeconfig.remote }}"
+
 - hosts: elasticsearch_curator
   become: true
   become_method: sudo