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

roles/kubernetes-apps/ansible/tasks/main.yml

@@ -16,7 +16,8 @@
     resource: "{{ item }}"
     state: absent
   with_items: ['deploy', 'svc']
-  tags: upgrade
+  tags:
+    - upgrade
 
 - name: Kubernetes Apps | Delete kubeadm kubedns
   kube:
@@ -46,7 +47,8 @@
   when:
     - dns_mode != 'none' and inventory_hostname == groups['kube-master'][0]
     - rbac_enabled or item.type not in rbac_resources
-  tags: dnsmasq
+  tags:
+    - dnsmasq
 
 # see https://github.com/kubernetes/kubernetes/issues/45084, only needed for "old" kube-dns
 - name: Kubernetes Apps | Patch system:kube-dns ClusterRole
@@ -64,7 +66,8 @@
   when:
     - dns_mode != 'none' and inventory_hostname == groups['kube-master'][0]
     - rbac_enabled and kubedns_version|version_compare("1.11.0", "<", strict=True)
-  tags: dnsmasq
+  tags:
+    - dnsmasq
 
 - name: Kubernetes Apps | Start Resources
   kube:
@@ -79,14 +82,17 @@
     - dns_mode != 'none'
     - inventory_hostname == groups['kube-master'][0]
     - not item|skipped
-  tags: dnsmasq
+  tags:
+    - dnsmasq
 
 - name: Kubernetes Apps | Netchecker
   include: tasks/netchecker.yml
   when: deploy_netchecker
-  tags: netchecker
+  tags:
+    - netchecker
 
 - name: Kubernetes Apps | Dashboard
   include: tasks/dashboard.yml
   when: dashboard_enabled
-  tags: dashboard
+  tags:
+    - dashboard

roles/kubernetes-apps/ansible/tasks/netchecker.yml

@@ -4,7 +4,9 @@
   stat:
     path: "{{ kube_config_dir }}/netchecker-server-deployment.yml.j2"
   register: netchecker_server_manifest
-  tags: ['facts', 'upgrade']
+  tags:
+    - facts
+    - upgrade
 
 - name: Kubernetes Apps | Apply netchecker-server manifest to update annotations
   kube:
@@ -15,7 +17,8 @@
     resource: "deploy"
     state: latest
   when: inventory_hostname == groups['kube-master'][0] and netchecker_server_manifest.stat.exists
-  tags: upgrade
+  tags:
+    - upgrade
 
 - name: Kubernetes Apps | Lay Down Netchecker Template
   template:

roles/kubernetes-apps/meta/main.yml

@@ -3,16 +3,34 @@ dependencies:
   - 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]
-  - {role: kubernetes-apps/ansible, tags: apps}
-  - {role: kubernetes-apps/kpm, tags: [apps, kpm]}
+    tags:
+      - download
+      - netchecker
+
+  - role: kubernetes-apps/ansible
+    tags:
+      - apps
+
+  - role: kubernetes-apps/kpm
+    tags:
+      - apps
+      - kpm
+
   - role: kubernetes-apps/efk
     when: efk_enabled
-    tags: [ apps, efk ]
+    tags:
+      - apps
+      - efk
+
   - role: kubernetes-apps/helm
     when: helm_enabled
-    tags: [ apps, helm ]
+    tags:
+      - apps
+      - helm

roles/kubernetes-apps/network_plugin/meta/main.yml

@@ -2,13 +2,20 @@
 dependencies:
   - role: kubernetes-apps/network_plugin/calico
     when: kube_network_plugin == 'calico'
-    tags: calico
+    tags:
+      - calico
+
   - role: kubernetes-apps/network_plugin/canal
     when: kube_network_plugin == 'canal'
-    tags: canal
+    tags:
+      - canal
+
   - role: kubernetes-apps/network_plugin/flannel
     when: kube_network_plugin == 'flannel'
-    tags: flannel
+    tags:
+      - flannel
+
   - role: kubernetes-apps/network_plugin/weave
     when: kube_network_plugin == 'weave'
-    tags: weave
+    tags:
+      - weave

roles/kubernetes-apps/policy_controller/calico/tasks/main.yml

@@ -3,7 +3,9 @@
   set_fact:
     calico_cert_dir: "{{ canal_cert_dir }}"
   when: kube_network_plugin == 'canal'
-  tags: [facts, canal]
+  tags:
+    - facts
+    - canal
 
 - name: Get calico-policy-controller version if running
   shell: "{{ bin_dir }}/kubectl -n {{ system_namespace }} get rs calico-policy-controller -o=jsonpath='{$.spec.template.spec.containers[:1].image}' | cut -d':' -f2"

roles/kubernetes-apps/policy_controller/meta/main.yml

@@ -2,13 +2,23 @@
 dependencies:
   - role: download
     file: "{{ downloads.calico_policy }}"
-    when: enable_network_policy and
-      kube_network_plugin in ['calico', 'canal']
-    tags: [download, canal, policy-controller]
+    when:
+      - enable_network_policy
+      - kube_network_plugin in ['calico', 'canal']
+    tags:
+      - download
+      - canal
+      - policy-controller
+
   - role: policy_controller/calico
-    when: kube_network_plugin == 'calico' and
-      enable_network_policy
-    tags: policy-controller
+    when:
+      - kube_network_plugin == 'calico'
+      - enable_network_policy
+    tags:
+      - policy-controller
+
   - role: policy_controller/calico
-    when: kube_network_plugin == 'canal'
-    tags: policy-controller
+    when:
+      - kube_network_plugin == 'canal'
+    tags:
+      - policy-controller