From a6a14e7f77163c34eb0a86819283688048dfb008 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Wed, 22 Aug 2018 18:17:11 +0200
Subject: [PATCH] create the service account and roles even if the rbac is not
 enabled. it will just be ignored

---
 .../ansible/templates/netchecker-agent-ds.yml.j2                | 2 --
 .../ansible/templates/netchecker-agent-hostnet-ds.yml.j2        | 2 --
 .../kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 | 2 --
 roles/kubernetes-apps/registry/templates/registry-rs.yml.j2     | 2 --
 4 files changed, 8 deletions(-)

diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
index 23d08ec56..431448231 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
@@ -43,9 +43,7 @@ spec:
           securityContext:
             runAsUser: {{ netchecker_agent_user | default('0') }}
             runAsGroup: {{ netchecker_agent_group | default('0') }}
-{% if rbac_enabled %}
       serviceAccountName: netchecker-agent
-{% endif %}
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 100%
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
index cd8f2c9f3..ad32d509a 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
@@ -47,9 +47,7 @@ spec:
           securityContext:
             runAsUser: {{ netchecker_agent_user | default('0') }}
             runAsGroup: {{ netchecker_agent_group | default('0') }}
-{% if rbac_enabled %}
       serviceAccountName: netchecker-agent
-{% endif %}
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 100%
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
index 8d6fbbfd7..0a04c40d1 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
@@ -21,9 +21,7 @@ spec:
         kubernetes.io/cluster-service: "true"
         version: v{{ registry_proxy_image_tag }}
     spec:
-{% if rbac_enabled %}
       serviceAccountName: registry-proxy
-{% endif %}
       containers:
         - name: registry-proxy
           image: {{ registry_proxy_image_repo }}:{{ registry_proxy_image_tag }}
diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
index 627144cd4..3ca8e217d 100644
--- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
@@ -22,9 +22,7 @@ spec:
         version: v{{ registry_image_tag }}
         kubernetes.io/cluster-service: "true"
     spec:
-{% if rbac_enabled %}
       serviceAccountName: registry
-{% endif %}
       containers:
         - name: registry
           image: {{ registry_image_repo }}:{{ registry_image_tag }}