Normalize tags in all places to prepare for tag fixing in future (#1739)

roles/kubernetes/node/meta/main.yml

@@ -2,44 +2,90 @@
 dependencies:
   - role: download
     file: "{{ downloads.hyperkube }}"
-    tags: [download, hyperkube, kubelet, network, canal, calico, weave, kube-controller-manager, kube-scheduler, kube-apiserver, kube-proxy, kubectl]
+    tags:
+      - download
+      - hyperkube
+      - kubelet
+      - network
+      - canal
+      - calico
+      - weave
+      - kube-controller-manager
+      - kube-scheduler
+      - kube-apiserver
+      - kube-proxy
+      - kubectl
+
   - role: download
     file: "{{ downloads.pod_infra }}"
-    tags: [download, kubelet]
+    tags:
+      - download
+      - kubelet
+
   - role: download
     file: "{{ downloads.install_socat }}"
-    tags: [download, kubelet]
     when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS']
+    tags:
+      - download
+      - kubelet
+
   - role: download
     file: "{{ downloads.kubeadm }}"
-    tags: [download, kubelet, kubeadm]
     when: kubeadm_enabled
+    tags:
+      - download
+      - kubelet
+      - kubeadm
+
   - role: kubernetes/secrets
     when: not kubeadm_enabled
-    tags: k8s-secrets
+    tags:
+      - k8s-secrets
   - role: download
     file: "{{ downloads.nginx }}"
-    tags: [download, nginx]
+    tags:
+      - download
+      - nginx
+
   - role: download
     file: "{{ downloads.testbox }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.netcheck_server }}"
     when: deploy_netchecker
-    tags: [download, netchecker]
+    tags:
+      - download
+      - netchecker
+
   - role: download
     file: "{{ downloads.netcheck_agent }}"
     when: deploy_netchecker
-    tags: [download, netchecker]
+    tags:
+      - download
+      - netchecker
+
   - role: download
     file: "{{ downloads.kubedns }}"
-    tags: [download, dnsmasq]
+    tags:
+      - download
+      - dnsmasq
+
   - role: download
     file: "{{ downloads.dnsmasq_nanny }}"
-    tags: [download, dnsmasq]
+    tags:
+      - download
+      - dnsmasq
+
   - role: download
     file: "{{ downloads.dnsmasq_sidecar }}"
-    tags: [download, dnsmasq]
+    tags:
+      - download
+      - dnsmasq
+
   - role: download
     file: "{{ downloads.kubednsautoscaler }}"
-    tags: [download, dnsmasq]
+    tags:
+      - download
+      - dnsmasq

roles/kubernetes/node/tasks/install.yml

@@ -11,19 +11,22 @@
       '/usr/share/ca-certificates',
       {% endif -%}
     ]"
-  tags: facts
+  tags:
+    - facts
 
 - name: Set kubelet deployment to host if kubeadm is enabled
   set_fact:
     kubelet_deployment_type: host
   when: kubeadm_enabled
-  tags: kubeadm
+  tags:
+    - kubeadm
 
 - name: install | Copy kubeadm binary from download dir
   command: rsync -piu "{{ local_release_dir }}/kubeadm" "{{ bin_dir }}/kubeadm"
   changed_when: false
   when: kubeadm_enabled
-  tags: kubeadm
+  tags:
+    - kubeadm
 
 - name: install | Set kubeadm binary permissions
   file:
@@ -31,7 +34,8 @@
     mode: "0755"
     state: file
   when: kubeadm_enabled
-  tags: kubeadm
+  tags:
+    - kubeadm
 
 - include: "install_{{ kubelet_deployment_type }}.yml"
 

roles/kubernetes/node/tasks/install_host.yml

@@ -6,7 +6,9 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
-  tags: [hyperkube, upgrade]
+  tags:
+    - hyperkube
+    - upgrade
   notify: restart kubelet
 
 - name: install | Copy socat wrapper for Container Linux

roles/kubernetes/node/tasks/main.yml

@@ -1,9 +1,11 @@
 ---
 - include: facts.yml
-  tags: facts
+  tags:
+    - facts
 
 - include: pre_upgrade.yml
-  tags: kubelet
+  tags:
+    - kubelet
 
 - name: Ensure /var/lib/cni exists
   file:
@@ -12,11 +14,13 @@
     mode: 0755
 
 - include: install.yml
-  tags: kubelet
+  tags:
+    - kubelet
 
 - include: nginx-proxy.yml
   when: is_kube_master == false and loadbalancer_apiserver_localhost|default(true)
-  tags: nginx
+  tags:
+    - nginx
 
 - name: Write kubelet config file (non-kubeadm)
   template:
@@ -25,7 +29,8 @@
     backup: yes
   when: not kubeadm_enabled
   notify: restart kubelet
-  tags: kubelet
+  tags:
+    - kubelet
 
 - name: Write kubelet config file (kubeadm)
   template:
@@ -34,7 +39,9 @@
     backup: yes
   when: kubeadm_enabled
   notify: restart kubelet
-  tags: ['kubelet', 'kubeadm']
+  tags:
+    - kubelet
+    - kubeadm
 
 - name: write the kubecfg (auth) file for kubelet
   template:
@@ -46,7 +53,8 @@
     - kube-proxy
   when: not kubeadm_enabled
   notify: restart kubelet
-  tags: kubelet
+  tags:
+    - kubelet
 
 - name: Ensure nodePort range is reserved
   sysctl:
@@ -56,7 +64,8 @@
     state: present
     reload: yes
   when: kube_apiserver_node_port_range is defined
-  tags: kube-proxy
+  tags:
+    - kube-proxy
 
 - name: Verify if br_netfilter module exists
   shell: "modinfo br_netfilter"
@@ -94,14 +103,16 @@
     src: manifests/kube-proxy.manifest.j2
     dest: "{{ kube_manifest_dir }}/kube-proxy.manifest"
   when: not kubeadm_enabled
-  tags: kube-proxy
+  tags:
+    - kube-proxy
 
 - name: Purge proxy manifest for kubeadm
   file:
     path: "{{ kube_manifest_dir }}/kube-proxy.manifest"
     state: absent
   when: kubeadm_enabled
-  tags: kube-proxy
+  tags:
+    - kube-proxy
 
 # reload-systemd
 - meta: flush_handlers
@@ -111,4 +122,5 @@
     name: kubelet
     enabled: yes
     state: started
-  tags: kubelet
+  tags:
+    - kubelet

roles/kubernetes/node/tasks/pre_upgrade.yml

@@ -8,4 +8,4 @@
 - name: "Pre-upgrade | ensure kubelet container is stopped if using host deployment"
   command: docker stop kubelet
   failed_when: false
-  when: kubelet_deployment_type == "host"
+  when: kubelet_deployment_type == 'host'