Skip to content

OCPBUGS-12986: narrow down RBAC permissions #4230

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

Open
ffromani wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-12986: narrow down RBAC permissions #4230

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
70 changes: 55 additions & 15 deletions bundle/manifests/numaresources-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2026-05-13T12:16:00Z"
createdAt: "2026-05-27T16:22:04Z"
features.operators.openshift.io/cnf: "true"
features.operators.openshift.io/cni: "false"
features.operators.openshift.io/csi: "false"
Expand Down Expand Up @@ -378,9 +378,13 @@ spec:
- ""
resources:
- configmaps
- serviceaccounts
verbs:
- '*'
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- ""
resources:
Expand All @@ -403,19 +407,47 @@ spec:
- get
- list
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- create
- get
- list
- update
- watch
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- '*'
- create
- get
- list
- update
- watch
- apiGroups:
- apps
resources:
- daemonsets
verbs:
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- apps
resources:
- deployments
verbs:
- '*'
- create
- get
- list
- update
- watch
- apiGroups:
- config.openshift.io
resources:
Expand Down Expand Up @@ -457,7 +489,12 @@ spec:
resources:
- machineconfigs
verbs:
- '*'
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- nodetopology.openshift.io
resources:
Expand Down Expand Up @@ -491,22 +528,21 @@ spec:
- rolebindings
- roles
verbs:
- '*'
- create
- get
- list
- update
- watch
- apiGroups:
- security.openshift.io
resources:
- securitycontextconstraints
verbs:
- '*'
- apiGroups:
- topology.node.k8s.io
resources:
- noderesourcetopologies
verbs:
- create
- get
- list
- update
- watch
serviceAccountName: numaresources-controller-manager
deployments:
- label:
Expand Down Expand Up @@ -647,13 +683,17 @@ spec:
resources:
- services
verbs:
- '*'
- create
- get
- update
- apiGroups:
- networking.k8s.io
resources:
- networkpolicies
verbs:
- '*'
- create
- get
- update
serviceAccountName: numaresources-controller-manager
strategy: deployment
installModes:
Expand Down
68 changes: 54 additions & 14 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ rules:
- ""
resources:
- configmaps
- serviceaccounts
verbs:
- '*'
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- ""
resources:
Expand All @@ -33,19 +37,47 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- create
- get
- list
- update
- watch
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- '*'
- create
- get
- list
- update
- watch
- apiGroups:
- apps
resources:
- daemonsets
verbs:
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- apps
resources:
- deployments
verbs:
- '*'
- create
- get
- list
- update
- watch
- apiGroups:
- config.openshift.io
resources:
Expand Down Expand Up @@ -87,7 +119,12 @@ rules:
resources:
- machineconfigs
verbs:
- '*'
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- nodetopology.openshift.io
resources:
Expand Down Expand Up @@ -121,22 +158,21 @@ rules:
- rolebindings
- roles
verbs:
- '*'
- create
- get
- list
- update
- watch
- apiGroups:
- security.openshift.io
resources:
- securitycontextconstraints
verbs:
- '*'
- apiGroups:
- topology.node.k8s.io
resources:
- noderesourcetopologies
verbs:
- create
- get
- list
- update
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -149,10 +185,14 @@ rules:
resources:
- services
verbs:
- '*'
- create
- get
- update
- apiGroups:
- networking.k8s.io
resources:
- networkpolicies
verbs:
- '*'
- create
- get
- update
2 changes: 1 addition & 1 deletion internal/controller/kubeletconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type kubeletConfigHandler struct {
// Namespace Scoped

// Cluster Scoped
//+kubebuilder:rbac:groups="",resources=configmaps,verbs=*
//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;update;delete;list;watch
//+kubebuilder:rbac:groups="",resources=events,verbs=create;patch
//+kubebuilder:rbac:groups=machineconfiguration.openshift.io,resources=kubeletconfigs,verbs=get;list;watch
//+kubebuilder:rbac:groups=machineconfiguration.openshift.io,resources=kubeletconfigs/finalizers,verbs=update
Expand Down
22 changes: 11 additions & 11 deletions internal/controller/numaresourcesoperator_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,24 @@ type NUMAResourcesOperatorReconciler struct {
}

// Namespace Scoped
//+kubebuilder:rbac:groups="",resources=services,verbs=*,namespace="numaresources"
//+kubebuilder:rbac:groups=networking.k8s.io,resources=networkpolicies,verbs=*,namespace="numaresources"
//+kubebuilder:rbac:groups="",resources=services,verbs=get;create;update,namespace="numaresources"
//+kubebuilder:rbac:groups=networking.k8s.io,resources=networkpolicies,verbs=get;create;update,namespace="numaresources"

// Cluster Scoped
//+kubebuilder:rbac:groups=config.openshift.io,resources=apiservers,verbs=get;list;watch
//+kubebuilder:rbac:groups=config.openshift.io,resources=clusterversions,verbs=list
//+kubebuilder:rbac:groups=config.openshift.io,resources=clusteroperators,verbs=get
//+kubebuilder:rbac:groups=config.openshift.io,resources=infrastructures,verbs=get
//+kubebuilder:rbac:groups=machineconfiguration.openshift.io,resources=machineconfigs,verbs=*
//+kubebuilder:rbac:groups=machineconfiguration.openshift.io,resources=machineconfigs,verbs=get;create;update;delete;list;watch
//+kubebuilder:rbac:groups=machineconfiguration.openshift.io,resources=machineconfigpools,verbs=get;list;watch
//+kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,verbs=*
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=*
//+kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=roles,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=rolebindings,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=*
//+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=*
//+kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=get;create;update;delete;list;watch
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=roles,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=rolebindings,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=get;create;update
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=get;create;update
//+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch
//+kubebuilder:rbac:groups="",resources=nodes,verbs=list
//+kubebuilder:rbac:groups=nodetopology.openshift.io,resources=numaresourcesoperators,verbs=get;list;watch
Expand Down
12 changes: 6 additions & 6 deletions internal/controller/numaresourcesscheduler_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ type NUMAResourcesSchedulerReconciler struct {
}

// Namespace Scoped
//+kubebuilder:rbac:groups=networking.k8s.io,resources=networkpolicies,verbs=*,namespace="numaresources"
//+kubebuilder:rbac:groups=networking.k8s.io,resources=networkpolicies,verbs=get;create;update,namespace="numaresources"

// Cluster Scoped
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=*
//+kubebuilder:rbac:groups=apps,resources=deployments,verbs=*
//+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=*
//+kubebuilder:rbac:groups="",resources=configmaps,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;update;list;watch
//+kubebuilder:rbac:groups="",resources=nodes,verbs=list;watch
//+kubebuilder:rbac:groups=nodetopology.openshift.io,resources=numaresourcesschedulers,verbs=get;list;watch
//+kubebuilder:rbac:groups=nodetopology.openshift.io,resources=numaresourcesschedulers/status,verbs=get;update;patch
Expand Down
5 changes: 0 additions & 5 deletions rte/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ const (
defaultTopologyManagerScope = "container"
)

// Namespace Scoped

// Cluster Scoped
//+kubebuilder:rbac:groups=topology.node.k8s.io,resources=noderesourcetopologies,verbs=get;list;create;update

func main() {
bi := version.GetBuildInfo()
klog.Infof("starting %s %s %s\n", version.ExporterProgramName(), bi.String(), runtime.Version())
Expand Down
Loading