Always create service account even rbac_enabled = false

2026-02-28 16:28:45 -03:30 · 2018-08-22 11:41:29 +08:00
parent 7398858572
commit c3b3572025
34 changed files with 3 additions and 78 deletions
--- a/roles/network_plugin/flannel/tasks/main.yml
+++ b/roles/network_plugin/flannel/tasks/main.yml
@@ -11,4 +11,3 @@
  register: flannel_node_manifests
  when:
    - inventory_hostname in groups['kube-master']
-    - rbac_enabled or item.type not in rbac_resources
--- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
+++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -52,9 +52,7 @@ spec:
        tier: node
        k8s-app: flannel
    spec:
-{% if rbac_enabled %}
      serviceAccountName: flannel
-{% endif %}
      containers:
      - name: kube-flannel
        image: {{ flannel_image_repo }}:{{ flannel_image_tag }}