Skip to content

Commit 2c11f9d

Browse files
Merge pull request #17261 from bparees/ti_controller
Automatic merge from submit-queue (batch tested with PRs 16843, 17095, 17267, 17261, 17274). fix up template instance controller permissions fixes #17260
2 parents 04431da + d7f7eaf commit 2c11f9d

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

pkg/cmd/server/bootstrappolicy/controller_policy.go

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ func init() {
156156
ObjectMeta: metav1.ObjectMeta{Name: saRolePrefix + InfraTemplateInstanceControllerServiceAccountName},
157157
Rules: []rbac.PolicyRule{
158158
rbac.NewRule("create").Groups(kAuthzGroup).Resources("subjectaccessreviews").RuleOrDie(),
159-
rbac.NewRule("get", "list", "watch").Groups(templateGroup).Resources("subjectaccessreviews").RuleOrDie(),
160159
rbac.NewRule("update").Groups(templateGroup).Resources("templateinstances/status").RuleOrDie(),
161160
rbac.NewRule("update").Groups(templateGroup).Resources("templateinstances/finalizers").RuleOrDie(),
162161
},

test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -3120,14 +3120,6 @@ items:
31203120
- subjectaccessreviews
31213121
verbs:
31223122
- create
3123-
- apiGroups:
3124-
- template.openshift.io
3125-
resources:
3126-
- subjectaccessreviews
3127-
verbs:
3128-
- get
3129-
- list
3130-
- watch
31313123
- apiGroups:
31323124
- template.openshift.io
31333125
resources:

test/testdata/bootstrappolicy/bootstrap_policy_file.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -3404,15 +3404,6 @@ items:
34043404
- subjectaccessreviews
34053405
verbs:
34063406
- create
3407-
- apiGroups:
3408-
- template.openshift.io
3409-
attributeRestrictions: null
3410-
resources:
3411-
- subjectaccessreviews
3412-
verbs:
3413-
- get
3414-
- list
3415-
- watch
34163407
- apiGroups:
34173408
- template.openshift.io
34183409
attributeRestrictions: null

0 commit comments

Comments
 (0)