Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1915661: update image-pruner role to include jobs, cronjobs and statefulsets #177

Merged
merged 2 commits into from
Jan 14, 2021
Merged

Bug 1915661: update image-pruner role to include jobs, cronjobs and statefulsets #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe2743
Bug 1915661: update image-pruner role to include jobs, cronjobs and s…
soltysh Jan 13, 2021
902df2c
Get rid of extensionsGroup where it's not being used anymore
soltysh Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions pkg/bootstrappolicy/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@ func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {

rbacv1helpers.NewRule(read...).Groups(coordinationGroup).Resources("leases").RuleOrDie(),

rbacv1helpers.NewRule(read...).Groups(extensionsGroup).Resources("daemonsets/status", "deployments/status", "horizontalpodautoscalers",
"horizontalpodautoscalers/status", "ingresses/status", "jobs", "jobs/status", "podsecuritypolicies", "replicasets/status", "replicationcontrollers",
"storageclasses", "thirdpartyresources").RuleOrDie(),

rbacv1helpers.NewRule(read...).Groups(eventsGroup).Resources("events").RuleOrDie(),

rbacv1helpers.NewRule(read...).Groups(networkingGroup).Resources("ingresses/status").RuleOrDie(),
Expand Down Expand Up @@ -352,7 +348,7 @@ func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {

rbacv1helpers.NewRule(readWrite...).Groups(templateGroup, legacyTemplateGroup).Resources("templates", "templateconfigs", "processedtemplates", "templateinstances").RuleOrDie(),

rbacv1helpers.NewRule(readWrite...).Groups(extensionsGroup, networkingGroup).Resources("networkpolicies").RuleOrDie(),
rbacv1helpers.NewRule(readWrite...).Groups(networkingGroup).Resources("networkpolicies").RuleOrDie(),

// backwards compatibility
rbacv1helpers.NewRule(readWrite...).Groups(buildGroup, legacyBuildGroup).Resources("buildlogs").RuleOrDie(),
Expand Down Expand Up @@ -394,7 +390,7 @@ func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {

rbacv1helpers.NewRule(readWrite...).Groups(templateGroup, legacyTemplateGroup).Resources("templates", "templateconfigs", "processedtemplates", "templateinstances").RuleOrDie(),

rbacv1helpers.NewRule(readWrite...).Groups(extensionsGroup, networkingGroup).Resources("networkpolicies").RuleOrDie(),
rbacv1helpers.NewRule(readWrite...).Groups(networkingGroup).Resources("networkpolicies").RuleOrDie(),

// backwards compatibility
rbacv1helpers.NewRule(readWrite...).Groups(buildGroup, legacyBuildGroup).Resources("buildlogs").RuleOrDie(),
Expand Down Expand Up @@ -563,9 +559,12 @@ func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {
rbacv1helpers.NewRule("list").Groups(kapiGroup).Resources("limitranges").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(buildGroup, legacyBuildGroup).Resources("buildconfigs", "builds").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(deployGroup, legacyDeployGroup).Resources("deploymentconfigs").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup, extensionsGroup).Resources("daemonsets").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup, extensionsGroup).Resources("deployments").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup, extensionsGroup).Resources("replicasets").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(batchGroup).Resources("jobs").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(batchGroup).Resources("cronjobs").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup).Resources("daemonsets").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup).Resources("deployments").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup).Resources("replicasets").RuleOrDie(),
rbacv1helpers.NewRule("get", "list").Groups(appsGroup).Resources("statefulsets").RuleOrDie(),

rbacv1helpers.NewRule("delete").Groups(imageGroup, legacyImageGroup).Resources("images").RuleOrDie(),
rbacv1helpers.NewRule("get", "list", "watch").Groups(imageGroup, legacyImageGroup).Resources("images", "imagestreams").RuleOrDie(),
Expand Down Expand Up @@ -670,7 +669,6 @@ func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {
Rules: []rbacv1.PolicyRule{
rbacv1helpers.NewRule(read...).Groups(networkGroup, legacyNetworkGroup).Resources("egressnetworkpolicies", "hostsubnets", "netnamespaces").RuleOrDie(),
rbacv1helpers.NewRule(read...).Groups(kapiGroup).Resources("nodes", "namespaces").RuleOrDie(),
rbacv1helpers.NewRule(read...).Groups(extensionsGroup).Resources("networkpolicies").RuleOrDie(),
rbacv1helpers.NewRule(read...).Groups(networkingGroup).Resources("networkpolicies").RuleOrDie(),
rbacv1helpers.NewRule("get").Groups(networkGroup, legacyNetworkGroup).Resources("clusternetworks").RuleOrDie(),
rbacv1helpers.NewRule("create", "update", "patch").Groups(kapiGroup).Resources("events").RuleOrDie(),
Expand Down
53 changes: 21 additions & 32 deletions test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,6 @@ items:
- get
- list
- watch
- apiGroups:
- extensions
resources:
- daemonsets/status
- deployments/status
- horizontalpodautoscalers
- horizontalpodautoscalers/status
- ingresses/status
- jobs
- jobs/status
- podsecuritypolicies
- replicasets/status
- replicationcontrollers
- storageclasses
- thirdpartyresources
verbs:
- get
- list
- watch
- apiGroups:
- events.k8s.io
resources:
Expand Down Expand Up @@ -813,7 +794,6 @@ items:
- update
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- networkpolicies
Expand Down Expand Up @@ -1055,7 +1035,6 @@ items:
- update
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- networkpolicies
Expand Down Expand Up @@ -1518,30 +1497,48 @@ items:
verbs:
- get
- list
- apiGroups:
- batch
resources:
- jobs
verbs:
- get
- list
- apiGroups:
- batch
resources:
- cronjobs
verbs:
- get
- list
- apiGroups:
- apps
- extensions
resources:
- daemonsets
verbs:
- get
- list
- apiGroups:
- apps
- extensions
resources:
- deployments
verbs:
- get
- list
- apiGroups:
- apps
- extensions
resources:
- replicasets
verbs:
- get
- list
- apiGroups:
- apps
resources:
- statefulsets
verbs:
- get
- list
- apiGroups:
- ""
- image.openshift.io
Expand Down Expand Up @@ -1832,14 +1829,6 @@ items:
- get
- list
- watch
- apiGroups:
- extensions
resources:
- networkpolicies
verbs:
- get
- list
- watch
- apiGroups:
- networking.k8s.io
resources:
Expand Down