From f1d366779e87dddd019ef6616cb39ae275f4d277 Mon Sep 17 00:00:00 2001
From: Boris Zanetti <boris.zanetti@polyconseil.fr>
Date: Sat, 15 Apr 2017 12:23:51 +0200
Subject: [PATCH] move kubedns rbac to specific role

---
 roles/kubernetes-apps/ansible/tasks/main.yml                   | 3 ---
 roles/rbac/tasks/main.yml                                      | 3 +++
 .../ansible => rbac}/templates/kubedns-clusterrole.yml         | 0
 .../ansible => rbac}/templates/kubedns-clusterrolebinding.yml  | 0
 .../ansible => rbac}/templates/kubedns-serviceaccount.yml      | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename roles/{kubernetes-apps/ansible => rbac}/templates/kubedns-clusterrole.yml (100%)
 rename roles/{kubernetes-apps/ansible => rbac}/templates/kubedns-clusterrolebinding.yml (100%)
 rename roles/{kubernetes-apps/ansible => rbac}/templates/kubedns-serviceaccount.yml (100%)

diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml
index 6af2eb506..ed0d11f28 100644
--- a/roles/kubernetes-apps/ansible/tasks/main.yml
+++ b/roles/kubernetes-apps/ansible/tasks/main.yml
@@ -13,9 +13,6 @@
     src: "{{item.file}}"
     dest: "{{kube_config_dir}}/{{item.file}}"
   with_items:
-    - {name: kubedns, file: kubedns-serviceaccount.yml, type: serviceaccount}
-    - {name: kubedns, file: kubedns-clusterrole.yml, type: clusterrole}
-    - {name: kubedns, file: kubedns-clusterrolebinding.yml, type: clusterrolebinding}
     - {name: kubedns, file: kubedns-deploy.yml, type: deployment}
     - {name: kubedns, file: kubedns-svc.yml, type: svc}
     - {name: kubedns-autoscaler, file: kubedns-autoscaler.yml, type: deployment}
diff --git a/roles/rbac/tasks/main.yml b/roles/rbac/tasks/main.yml
index 2e5965b60..9c1340a82 100644
--- a/roles/rbac/tasks/main.yml
+++ b/roles/rbac/tasks/main.yml
@@ -13,6 +13,9 @@
     - {name: cluster-proportional-autoscaler, file: cluster-proportional-autoscaler-serviceaccount.yml, type: serviceaccount}
     - {name: cluster-proportional-autoscaler, file: cluster-proportional-autoscaler-clusterrole.yml, type: clusterrole}
     - {name: cluster-proportional-autoscaler, file: cluster-proportional-autoscaler-clusterrolebinding.yml, type: clusterrolebinding}
+    - {name: kubedns, file: kubedns-serviceaccount.yml, type: serviceaccount}
+    - {name: kubedns, file: kubedns-clusterrole.yml, type: clusterrole}
+    - {name: kubedns, file: kubedns-clusterrolebinding.yml, type: clusterrolebinding}
     - {name: 'custom:system:kube-dns', file: 'custom:system:kube-dns-clusterrole.yml', type: clusterrole}
     - {name: 'custom:system:kube-dns', file: 'custom:system:kube-dns-clusterrolebinding.yml', type: clusterrolebinding}
     - {name: fluentd, file: fluentd-clusterrole.yml, type: clusterrole}
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-clusterrole.yml b/roles/rbac/templates/kubedns-clusterrole.yml
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-clusterrole.yml
rename to roles/rbac/templates/kubedns-clusterrole.yml
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-clusterrolebinding.yml b/roles/rbac/templates/kubedns-clusterrolebinding.yml
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-clusterrolebinding.yml
rename to roles/rbac/templates/kubedns-clusterrolebinding.yml
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-serviceaccount.yml b/roles/rbac/templates/kubedns-serviceaccount.yml
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-serviceaccount.yml
rename to roles/rbac/templates/kubedns-serviceaccount.yml