Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove project admin/edit ability to create daemonsets #8242

Merged
merged 1 commit into from
Mar 25, 2016
Merged

Remove project admin/edit ability to create daemonsets #8242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/cmd/server/bootstrappolicy/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,12 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {
{
APIGroups: []string{extensions.GroupName},
Verbs: sets.NewString("get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"),
Resources: sets.NewString("daemonsets", "jobs", "horizontalpodautoscalers", "replicationcontrollers/scale"),
Resources: sets.NewString("jobs", "horizontalpodautoscalers", "replicationcontrollers/scale"),
},
{
APIGroups: []string{extensions.GroupName},
Verbs: sets.NewString("get", "list", "watch"),
Resources: sets.NewString("daemonsets"),
},
{
Verbs: sets.NewString("get", "list", "watch"),
Expand Down Expand Up @@ -210,7 +215,12 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {
{
APIGroups: []string{extensions.GroupName},
Verbs: sets.NewString("get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"),
Resources: sets.NewString("daemonsets", "jobs", "horizontalpodautoscalers", "replicationcontrollers/scale"),
Resources: sets.NewString("jobs", "horizontalpodautoscalers", "replicationcontrollers/scale"),
},
{
APIGroups: []string{extensions.GroupName},
Verbs: sets.NewString("get", "list", "watch"),
Resources: sets.NewString("daemonsets"),
},
{
Verbs: sets.NewString("get", "list", "watch"),
Expand Down
20 changes: 18 additions & 2 deletions test/fixtures/bootstrappolicy/bootstrap_cluster_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ items:
- extensions
attributeRestrictions: null
resources:
- daemonsets
- horizontalpodautoscalers
- jobs
- replicationcontrollers/scale
Expand All @@ -284,6 +283,15 @@ items:
- patch
- update
- watch
- apiGroups:
- extensions
attributeRestrictions: null
resources:
- daemonsets
verbs:
- get
- list
- watch
- apiGroups: null
attributeRestrictions: null
resources:
Expand Down Expand Up @@ -436,7 +444,6 @@ items:
- extensions
attributeRestrictions: null
resources:
- daemonsets
- horizontalpodautoscalers
- jobs
- replicationcontrollers/scale
Expand All @@ -449,6 +456,15 @@ items:
- patch
- update
- watch
- apiGroups:
- extensions
attributeRestrictions: null
resources:
- daemonsets
verbs:
- get
- list
- watch
- apiGroups: null
attributeRestrictions: null
resources:
Expand Down