Skip to content

fix: Remove inert subjectaccessreviews and reorganize RBAC rules #6736

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
ntkathole wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −14
Open

fix: Remove inert subjectaccessreviews and reorganize RBAC rules #6736

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
27 changes: 26 additions & 1 deletion infra/feast-operator/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,35 @@ rules:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
verbs:
- create
- delete
- get
- list
- update
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterroles
verbs:
- create
- apiGroups:
- rbac.authorization.k8s.io
resourceNames:
- feast-discover-namespaces
- feast-oidc-token-review
- feast-token-review-cluster-role
resources:
- clusterroles
verbs:
- delete
- get
- update
- apiGroups:
- rbac.authorization.k8s.io
resources:
- rolebindings
- roles
- subjectaccessreviews
verbs:
- create
- delete
Expand Down
27 changes: 26 additions & 1 deletion infra/feast-operator/dist/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22321,10 +22321,35 @@ rules:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
verbs:
- create
- delete
- get
- list
- update
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterroles
verbs:
- create
- apiGroups:
- rbac.authorization.k8s.io
resourceNames:
- feast-discover-namespaces
- feast-oidc-token-review
- feast-token-review-cluster-role
resources:
- clusterroles
verbs:
- delete
- get
- update
- apiGroups:
- rbac.authorization.k8s.io
resources:
- rolebindings
- roles
- subjectaccessreviews
verbs:
- create
- delete
Expand Down
10 changes: 0 additions & 10 deletions infra/feast-operator/internal/controller/authz/authz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,6 @@ func (authz *FeastAuthorization) setFeastClusterRole(clusterRole *rbacv1.Cluster
Resources: []string{resourceTokenReviews},
Verbs: []string{verbCreate},
},
{
APIGroups: []string{rbacv1.GroupName},
Resources: []string{"subjectaccessreviews"},
Verbs: []string{verbCreate},
},
{
APIGroups: []string{""},
Resources: []string{"namespaces"},
Expand Down Expand Up @@ -250,11 +245,6 @@ func (authz *FeastAuthorization) setFeastRole(role *rbacv1.Role) error {
Resources: []string{resourceTokenReviews},
Verbs: []string{verbCreate},
},
{
APIGroups: []string{rbacv1.GroupName},
Resources: []string{"subjectaccessreviews"},
Verbs: []string{verbCreate},
},
{
APIGroups: []string{""},
Resources: []string{"namespaces"},
Expand Down
5 changes: 4 additions & 1 deletion infra/feast-operator/internal/controller/featurestore_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ type FeatureStoreReconciler struct {
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;create;update;watch;delete
// +kubebuilder:rbac:groups=core,resources=services;configmaps;persistentvolumeclaims,verbs=get;list;create;update;watch;delete;deletecollection
// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;create;update;watch;delete
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=roles;rolebindings;clusterroles;clusterrolebindings;subjectaccessreviews,verbs=get;list;create;update;watch;delete
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=roles;rolebindings,verbs=get;list;create;update;watch;delete
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=get;list;create;update;delete
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=create
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,resourceNames=feast-discover-namespaces;feast-oidc-token-review;feast-token-review-cluster-role,verbs=get;update;delete
// +kubebuilder:rbac:groups=core,resources=secrets;namespaces,verbs=get;list;watch
// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;delete;deletecollection
// +kubebuilder:rbac:groups=core,resources=pods/exec,verbs=create
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_kubernetes_auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ var _ = Describe("FeatureStore Controller-Kubernetes authorization", func() {
feastRole)
Expect(err).NotTo(HaveOccurred())
Expect(feastRole.Rules).ToNot(BeEmpty())
Expect(feastRole.Rules).To(HaveLen(6))
Expect(feastRole.Rules).To(HaveLen(5))
Expect(feastRole.Rules[0].APIGroups).To(HaveLen(1))
Expect(feastRole.Rules[0].APIGroups[0]).To(Equal(rbacv1.GroupName))
Expect(feastRole.Rules[0].Resources).To(HaveLen(2))
Expand Down
Loading