Merge pull request #3283 from mattymo/more_upgrade_options

Extra options for upgrade mode

roles/upgrade/pre-upgrade/defaults/main.yml

@@ -1,3 +1,5 @@
 ---
 drain_grace_period: 300
 drain_timeout: 360s
+drain_label_selector: ""
+drain_nodes: true

roles/upgrade/pre-upgrade/tasks/main.yml

@@ -35,10 +35,13 @@
 - name: Drain node
   command: >-
     {{ bin_dir }}/kubectl drain
-      --force
-      --ignore-daemonsets
-      --grace-period {{ drain_grace_period }}
-      --timeout {{ drain_timeout }}
-      --delete-local-data {{ inventory_hostname }}
+    --force
+    --ignore-daemonsets
+    --grace-period {{ drain_grace_period }}
+    --timeout {{ drain_timeout }}
+    --delete-local-data {{ inventory_hostname }}
+    {% if drain_label_selector != "" %}--selector '{{ drain_label_selector }}'{% endif %}
   delegate_to: "{{ groups['kube-master'][0] }}"
-  when: needs_cordoning
+  when:
+    - drain_nodes
+    - needs_cordoning