External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-14 01:34:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

Flannel RBAC Fix

Browse Source 
Fixes a bug that can occur if `cni-flannel-rbac.yml` was written but the playbook failed before it was applied. Uses the same approach as calico.
This commit is contained in:
Chad Swenson
2017-11-02 23:20:23 -05:00
parent 5c5e879c2c
commit 16ae2c1809
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
roles/network_plugin/flannel/tasks/main.yml
View File

@@ -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
dest: "{{ kube_config_dir }}/cni-flannel-rbac.yml"
register: flannel_rbac_manifest
when: inventory_hostname == groups['kube-master'][0] and rbac_enabled
- name: Flannel | Create cni-flannel manifest
template:
src: cni-flannel.yml.j2
dest: "{{ kube_config_dir }}/cni-flannel.yml"
register: flannel_manifest
when: inventory_hostname == groups['kube-master'][0]
src: "{{item.file}}.j2"
dest: "{{kube_config_dir}}/{{item.file}}"
with_items:
- {name: flannel, file: cni-flannel-rbac.yml, type: sa}
- {name: kube-flannel, file: cni-flannel.yml, type: ds}
register: flannel_node_manifests
when:
- inventory_hostname in groups['kube-master']
- rbac_enabled or item.type not in rbac_resources