Changes after review

hitachienergy · Jul 31, 2020 · 69a5c38 · 69a5c38
1 parent ecb4262
commit 69a5c38
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...i/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/Debian/unhold-packages.yml b/...i/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/Debian/unhold-packages.yml
@@ -4,4 +4,4 @@
 
 - name: "k8s/install | Unhold packages: {{ packages | join( ', ' ) }}"
   command: >-
-    apt-mark unhold {{ packages | join( ' ' ) }}
+    apt-mark unhold {{ packages | join( ' ' ) }}
diff --git a/...c/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-master0.yml b/...c/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-master0.yml
@@ -103,11 +103,11 @@
 - name: k8s/master0 | Customize CoreDNS for latest Kubernetes ({{ version }})
   include_tasks: upgrade-coredns.yml
   when:
-    - last_upgrade
+    - upgrade_to_final_version
 
 - name: Upgrade CNI plugin (deployment then local pod)
   when:
-    - last_upgrade
+    - upgrade_to_final_version
   block:
     - name: k8s/master0 | Upgrade CNI plugin deployment
       include_tasks: upgrade-cni-plugin-deployment.yml

diff --git a/...c/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-masterN.yml b/...c/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-masterN.yml
@@ -31,7 +31,7 @@
   import_tasks: upgrade-cni-plugin-pod.yml
   delegate_to: "{{ groups.kubernetes_master[0] }}"
   when:
-    - last_upgrade
+    - upgrade_to_final_version
 
 - name: k8s/masterN | Backup kubeadm-config.yml
   include_tasks: backup-kubeadm-config.yml

diff --git a/.../src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-node.yml b/.../src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/upgrade-node.yml
@@ -31,7 +31,7 @@
   import_tasks: upgrade-cni-plugin-pod.yml
   delegate_to: "{{ groups.kubernetes_master[0] }}"
   when:
-    - last_upgrade
+    - upgrade_to_final_version
 
 - name: k8s/node | Restart kubelet
   systemd:

diff --git a/core/src/epicli/data/common/ansible/playbooks/upgrade.yml b/core/src/epicli/data/common/ansible/playbooks/upgrade.yml
@@ -40,7 +40,7 @@
     - import_role:
         name: upgrade
         tasks_from: kubernetes
-      vars: { ver: "1.15.10", cni_ver: "0.7.5", last_upgrade: false }
+      vars: { ver: "1.15.10", cni_ver: "0.7.5", upgrade_to_final_version: false }
 
 - hosts: kubernetes_master:kubernetes_node
   serial: 1
@@ -50,7 +50,7 @@
     - import_role:
         name: upgrade
         tasks_from: kubernetes
-      vars: { ver: "1.16.7", cni_ver: "0.7.5", last_upgrade: false }
+      vars: { ver: "1.16.7", cni_ver: "0.7.5", upgrade_to_final_version: false }
 
 - hosts: kubernetes_master:kubernetes_node
   serial: 1
@@ -60,7 +60,7 @@
     - import_role:
         name: upgrade
         tasks_from: kubernetes
-      vars: { ver: "1.17.7", cni_ver: "0.8.6", cni_in_kubelet: true, last_upgrade: false }
+      vars: { ver: "1.17.7", cni_ver: "0.8.6", cni_in_kubelet: true, upgrade_to_final_version: false }
 
 - hosts: kubernetes_master:kubernetes_node
   serial: 1
@@ -70,7 +70,7 @@
     - import_role:
         name: upgrade
         tasks_from: kubernetes
-      vars: { ver: "1.18.6", cni_ver: "0.8.6", last_upgrade: true }
+      vars: { ver: "1.18.6", cni_ver: "0.8.6", upgrade_to_final_version: true }
 
 - hosts: elasticsearch
   become: true