From 9779f4c74d2847130af9265cccdeaab98351e5dd Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Wed, 24 Jan 2018 16:27:53 -0500
Subject: Change catalog roles install to use aggregation

Recently it was changed for openshift cluster roles to be reconciled via
the aggregate-to* label, so this is now updated. Rather than generating
portions of the file, simply use the auth reconciler and let it handle
any necessary role updates. Also, since it is theoretically possible for
conflicts to occur, retry reconciliation several times.
---
 .../templates/sc_admin_edit_role_patching.j2       | 27 ----------------------
 .../templates/sc_view_role_patching.j2             | 11 ---------
 2 files changed, 38 deletions(-)
 delete mode 100644 roles/openshift_service_catalog/templates/sc_admin_edit_role_patching.j2
 delete mode 100644 roles/openshift_service_catalog/templates/sc_view_role_patching.j2

(limited to 'roles/openshift_service_catalog/templates')

diff --git a/roles/openshift_service_catalog/templates/sc_admin_edit_role_patching.j2 b/roles/openshift_service_catalog/templates/sc_admin_edit_role_patching.j2
deleted file mode 100644
index 59cceafcf..000000000
--- a/roles/openshift_service_catalog/templates/sc_admin_edit_role_patching.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-{{ original_content }}
-- apiGroups:
-  - "servicecatalog.k8s.io"
-  attributeRestrictions: null
-  resources:
-  - serviceinstances
-  - servicebindings
-  verbs:
-  - create
-  - update
-  - delete
-  - get
-  - list
-  - watch
-  - patch
-- apiGroups:
-  - "settings.k8s.io"
-  attributeRestrictions: null
-  resources:
-  - podpresets
-  verbs:
-  - create
-  - update
-  - delete
-  - get
-  - list
-  - watch
diff --git a/roles/openshift_service_catalog/templates/sc_view_role_patching.j2 b/roles/openshift_service_catalog/templates/sc_view_role_patching.j2
deleted file mode 100644
index 838993854..000000000
--- a/roles/openshift_service_catalog/templates/sc_view_role_patching.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ original_content }}
-- apiGroups:
-  - "servicecatalog.k8s.io"
-  attributeRestrictions: null
-  resources:
-  - serviceinstances
-  - servicebindings
-  verbs:
-  - get
-  - list
-  - watch
-- 
cgit v1.2.3