Merge pull request #1928 from chadswen/flannel-rbac-fix

Flannel RBAC Fix

roles/kubernetes-apps/network_plugin/flannel/tasks/main.yml

@@ -1,19 +1,14 @@
 ---
-- name: "Flannel | Create ServiceAccount ClusterRole and ClusterRoleBinding"
-  command: "{{ bin_dir }}/kubectl apply -f {{ kube_config_dir }}/cni-flannel-rbac.yml"
-  run_once: true
-  when: rbac_enabled and flannel_rbac_manifest.changed
-
 - name: Flannel | Start Resources
   kube:
-    name: "kube-flannel"
+    name: "{{item.item.name}}"
-    kubectl: "{{ bin_dir }}/kubectl"
+    namespace: "{{ system_namespace }}"
-    filename: "{{ kube_config_dir }}/cni-flannel.yml"
+    kubectl: "{{bin_dir}}/kubectl"
-    resource: "ds"
+    resource: "{{item.item.type}}"
-    namespace: "{{system_namespace}}"
+    filename: "{{kube_config_dir}}/{{item.item.file}}"
     state: "latest"
-  with_items: "{{ flannel_manifest.changed }}"
+  with_items: "{{ flannel_node_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube-master'][0] and not item|skipped
 
 - name: Flannel | Wait for flannel subnet.env file presence
   wait_for:

roles/network_plugin/flannel/tasks/main.yml

@@ -1,16 +1,14 @@
 ---
 - include: pre-upgrade.yml
 
-- name: Flannel | Create cni-flannel-rbac manifest
+- name: Flannel | Create Flannel manifests
   template:
-    src: cni-flannel-rbac.yml.j2
+    src: "{{item.file}}.j2"
-    dest: "{{ kube_config_dir }}/cni-flannel-rbac.yml"
+    dest: "{{kube_config_dir}}/{{item.file}}"
-  register: flannel_rbac_manifest
+  with_items:
-  when: inventory_hostname == groups['kube-master'][0] and rbac_enabled
+    - {name: flannel, file: cni-flannel-rbac.yml, type: sa}
-
+    - {name: kube-flannel, file: cni-flannel.yml, type: ds}
-- name: Flannel | Create cni-flannel manifest
+  register: flannel_node_manifests
-  template:
+  when:
-    src: cni-flannel.yml.j2
+    - inventory_hostname in groups['kube-master']
-    dest: "{{ kube_config_dir }}/cni-flannel.yml"
+    - rbac_enabled or item.type not in rbac_resources
-  register: flannel_manifest
-  when: inventory_hostname == groups['kube-master'][0]