diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2018-01-24 16:27:53 -0500 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2018-01-24 20:45:41 -0500 |
| commit | 9779f4c74d2847130af9265cccdeaab98351e5dd (patch) | |
| tree | 693de32055ea97e150811abfb2ec039ee7a4d024 /roles/openshift_service_catalog/templates | |
| parent | 0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (diff) | |
| download | openshift-9779f4c74d2847130af9265cccdeaab98351e5dd.tar.gz openshift-9779f4c74d2847130af9265cccdeaab98351e5dd.tar.bz2 openshift-9779f4c74d2847130af9265cccdeaab98351e5dd.tar.xz openshift-9779f4c74d2847130af9265cccdeaab98351e5dd.zip | |
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.
Diffstat (limited to 'roles/openshift_service_catalog/templates')
| -rw-r--r-- | roles/openshift_service_catalog/templates/sc_admin_edit_role_patching.j2 | 27 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/templates/sc_view_role_patching.j2 | 11 |
2 files changed, 0 insertions, 38 deletions
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 |