Skip to content

Commit 9571d3b

Browse files
authored
Merge pull request kubernetes#125995 from carlory/remove-unnecessary-permissions
remove unneeded permissions for volume controllers
2 parents 6ded721 + ae9e381 commit 9571d3b

File tree

2 files changed

+22
-59
lines changed

2 files changed

+22
-59
lines changed

plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,10 @@ func buildControllerRoles() ([]rbacv1.ClusterRole, []rbacv1.ClusterRoleBinding)
186186
rbacv1helpers.NewRule("get", "list", "watch", "update", "patch").Groups(legacyGroup).Resources("persistentvolumes").RuleOrDie(),
187187
rbacv1helpers.NewRule("update", "patch").Groups(legacyGroup).Resources("persistentvolumeclaims/status").RuleOrDie(),
188188
rbacv1helpers.NewRule("get", "list", "watch").Groups(legacyGroup).Resources("persistentvolumeclaims").RuleOrDie(),
189-
// glusterfs
190-
rbacv1helpers.NewRule("get", "list", "watch").Groups(storageGroup).Resources("storageclasses").RuleOrDie(),
191-
rbacv1helpers.NewRule("get").Groups(legacyGroup).Resources("services", "endpoints").RuleOrDie(),
192-
rbacv1helpers.NewRule("get").Groups(legacyGroup).Resources("secrets").RuleOrDie(),
193189
eventsRule(),
190+
191+
// volume plugin - portworx
192+
rbacv1helpers.NewRule("get").Groups(legacyGroup).Resources("services").RuleOrDie(),
194193
},
195194
})
196195

@@ -281,19 +280,15 @@ func buildControllerRoles() ([]rbacv1.ClusterRole, []rbacv1.ClusterRoleBinding)
281280
rbacv1helpers.NewRule("get", "list", "watch", "update").Groups(legacyGroup).Resources("persistentvolumeclaims").RuleOrDie(),
282281
rbacv1helpers.NewRule("update").Groups(legacyGroup).Resources("persistentvolumeclaims/status").RuleOrDie(),
283282
rbacv1helpers.NewRule("list", "watch", "get", "create", "delete").Groups(legacyGroup).Resources("pods").RuleOrDie(),
284-
285-
// glusterfs
286283
rbacv1helpers.NewRule("get", "list", "watch").Groups(storageGroup).Resources("storageclasses").RuleOrDie(),
287-
rbacv1helpers.NewRule("get", "create", "update", "delete").Groups(legacyGroup).Resources("endpoints").RuleOrDie(),
288-
rbacv1helpers.NewRule("get", "create", "delete").Groups(legacyGroup).Resources("services").RuleOrDie(),
289-
rbacv1helpers.NewRule("get").Groups(legacyGroup).Resources("secrets").RuleOrDie(),
290-
// openstack
291-
rbacv1helpers.NewRule("get", "list").Groups(legacyGroup).Resources("nodes").RuleOrDie(),
284+
rbacv1helpers.NewRule("list", "watch").Groups(legacyGroup).Resources("nodes").RuleOrDie(),
285+
eventsRule(),
292286

293287
// recyclerClient.WatchPod
294288
rbacv1helpers.NewRule("watch").Groups(legacyGroup).Resources("events").RuleOrDie(),
295289

296-
eventsRule(),
290+
// volume plugin - portworx
291+
rbacv1helpers.NewRule("get").Groups(legacyGroup).Resources("services").RuleOrDie(),
297292
},
298293
})
299294
addControllerRole(&controllerRoles, &controllerRoleBindings, func() rbacv1.ClusterRole {

plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml

Lines changed: 15 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -653,27 +653,6 @@ items:
653653
- get
654654
- list
655655
- watch
656-
- apiGroups:
657-
- storage.k8s.io
658-
resources:
659-
- storageclasses
660-
verbs:
661-
- get
662-
- list
663-
- watch
664-
- apiGroups:
665-
- ""
666-
resources:
667-
- endpoints
668-
- services
669-
verbs:
670-
- get
671-
- apiGroups:
672-
- ""
673-
resources:
674-
- secrets
675-
verbs:
676-
- get
677656
- apiGroups:
678657
- ""
679658
- events.k8s.io
@@ -683,6 +662,12 @@ items:
683662
- create
684663
- patch
685664
- update
665+
- apiGroups:
666+
- ""
667+
resources:
668+
- services
669+
verbs:
670+
- get
686671
- apiVersion: rbac.authorization.k8s.io/v1
687672
kind: ClusterRole
688673
metadata:
@@ -1004,33 +989,19 @@ items:
1004989
- apiGroups:
1005990
- ""
1006991
resources:
1007-
- endpoints
992+
- nodes
1008993
verbs:
1009-
- create
1010-
- delete
1011-
- get
1012-
- update
994+
- list
995+
- watch
1013996
- apiGroups:
1014997
- ""
998+
- events.k8s.io
1015999
resources:
1016-
- services
1000+
- events
10171001
verbs:
10181002
- create
1019-
- delete
1020-
- get
1021-
- apiGroups:
1022-
- ""
1023-
resources:
1024-
- secrets
1025-
verbs:
1026-
- get
1027-
- apiGroups:
1028-
- ""
1029-
resources:
1030-
- nodes
1031-
verbs:
1032-
- get
1033-
- list
1003+
- patch
1004+
- update
10341005
- apiGroups:
10351006
- ""
10361007
resources:
@@ -1039,13 +1010,10 @@ items:
10391010
- watch
10401011
- apiGroups:
10411012
- ""
1042-
- events.k8s.io
10431013
resources:
1044-
- events
1014+
- services
10451015
verbs:
1046-
- create
1047-
- patch
1048-
- update
1016+
- get
10491017
- apiVersion: rbac.authorization.k8s.io/v1
10501018
kind: ClusterRole
10511019
metadata:

0 commit comments

Comments
 (0)