Skip to content

Commit b2dbcb2

Browse files
authored
pkg,test: Add deployments/finalizers to roles (#1157)
Because the Service now adds an OwnerReference wherever OwnerReferencesPermissionEnforcement is enabled this role is needed to be able to create an OwnerReference in the Service that points to the Deployment. Because we determine the owner of the Service dynamically, this role would need to be adjusted by the user to fit whatever type of deployment resource they use.
1 parent 0f889d0 commit b2dbcb2

File tree

7 files changed

+64
-0
lines changed

7 files changed

+64
-0
lines changed

pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/app-operator/0.1.0/app-operator.v0.1.0.clusterserviceversion.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ spec:
8484
- '*'
8585
verbs:
8686
- '*'
87+
- apiGroups:
88+
- apps
89+
resourceNames:
90+
- app-operator
91+
resources:
92+
- deployments/finalizers
93+
verbs:
94+
- update
8795
serviceAccountName: app-operator
8896
strategy: deployment
8997
installModes:

pkg/scaffold/olm-catalog/testdata/deploy/role.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,12 @@ rules:
3030
- '*'
3131
verbs:
3232
- '*'
33+
- apiGroups:
34+
- apps
35+
resources:
36+
- deployments/finalizers
37+
resourceNames:
38+
- app-operator
39+
verbs:
40+
- "update"
3341
serviceAccountName: app-operator

pkg/scaffold/role.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,12 @@ rules:
191191
verbs:
192192
- "get"
193193
- "create"
194+
- apiGroups:
195+
- apps
196+
resources:
197+
- deployments/finalizers
198+
resourceNames:
199+
- {{ .ProjectName }}
200+
verbs:
201+
- "update"
194202
`

pkg/scaffold/role_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ rules:
8585
verbs:
8686
- "get"
8787
- "create"
88+
- apiGroups:
89+
- apps
90+
resources:
91+
- deployments/finalizers
92+
resourceNames:
93+
- app-operator
94+
verbs:
95+
- "update"
8896
`
8997

9098
const clusterroleExp = `kind: ClusterRole
@@ -126,4 +134,12 @@ rules:
126134
verbs:
127135
- "get"
128136
- "create"
137+
- apiGroups:
138+
- apps
139+
resources:
140+
- deployments/finalizers
141+
resourceNames:
142+
- app-operator
143+
verbs:
144+
- "update"
129145
`

test/test-framework/deploy/namespace-init.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ rules:
3737
- '*'
3838
verbs:
3939
- '*'
40+
- apiGroups:
41+
- apps
42+
resources:
43+
- deployments/finalizers
44+
resourceNames:
45+
- memcached-operator
46+
verbs:
47+
- "update"
4048

4149
---
4250

test/test-framework/deploy/olm-catalog/memcached-operator/0.0.2/memcached-operator.v0.0.2.clusterserviceversion.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ spec:
5353
- '*'
5454
verbs:
5555
- '*'
56+
- apiGroups:
57+
- apps
58+
resources:
59+
- deployments/finalizers
60+
resourceNames:
61+
- memcached-operator
62+
verbs:
63+
- "update"
5664
deployments:
5765
- name: memcached-operator
5866
spec:

test/test-framework/deploy/role.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,11 @@ rules:
3030
- '*'
3131
verbs:
3232
- '*'
33+
- apiGroups:
34+
- apps
35+
resources:
36+
- deployments/finalizers
37+
resourceNames:
38+
- memcached-operator
39+
verbs:
40+
- "update"

0 commit comments

Comments
 (0)