re-add ansible finalizers rule

operator-framework · Oct 27, 2020 · 435d080 · 435d080
1 parent a21269d
commit 435d080
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/changelog/fragments/fix-helm-finalizers-permissions.yaml b/changelog/fragments/fix-helm-finalizers-permissions.yaml
@@ -5,7 +5,3 @@ entries:
       In Helm projects, fix operator RBAC permissions to support the OwnerReferencesPermissionEnforcement admission plugin by adding a `<resource>/finalizers` rule in the operator's role.
     kind: "bugfix"
     breaking: false
-  - description: >
-      In Ansible projects, remove operator RBAC permissions for `<resource>/finalizers` because the Ansible operator does not use finalizers on the main CR.
-    kind: "bugfix"
-    breaking: false
diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role.go
@@ -145,6 +145,7 @@ const rulesFragment = `  ##
     resources:
       - {{.Resource.Plural}}
       - {{.Resource.Plural}}/status
+      - {{.Resource.Plural}}/finalizers
     verbs:
       - create
       - delete

diff --git a/...ansible/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml b/...ansible/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
@@ -71,6 +71,7 @@ spec:
           resources:
           - memcacheds
           - memcacheds/status
+          - memcacheds/finalizers
           verbs:
           - create
           - delete

diff --git a/testdata/ansible/memcached-operator/config/rbac/role.yaml b/testdata/ansible/memcached-operator/config/rbac/role.yaml
@@ -45,6 +45,7 @@ rules:
     resources:
       - memcacheds
       - memcacheds/status
+      - memcacheds/finalizers
     verbs:
       - create
       - delete