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

[hotfix] Fix Service account typo #285

Merged
merged 3 commits into from
Jun 3, 2022
Merged

[hotfix] Fix Service account typo #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f66913
fix typo
DmitriGekhtman Jun 3, 2022
5fc5d1e
Revert manual change
DmitriGekhtman Jun 3, 2022
7a40eb0
Fix rbac in controller files and make manifests.
DmitriGekhtman Jun 3, 2022
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
2 changes: 1 addition & 1 deletion ray-operator/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ rules:
- apiGroups:
- ""
resources:
- serviceaccount
- serviceaccounts
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this change? serviceaccount should be correct.

Copy link
Contributor

@brucez-anyscale brucez-anyscale Jun 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need serviceaccount, we should update code

kuberay/ray-operator/controllers/ray/raycluster_controller.go

Line 77 in 7ecdd22

// +kubebuilder:rbac:groups=core,resources=serviceaccount,verbs=get;list;watch;create;delete

kuberay/ray-operator/controllers/ray/rayservice_controller.go

Line 48 in 7ecdd22

// +kubebuilder:rbac:groups=core,resources=serviceaccount,verbs=get;list;watch;create;delete

Change serviceaccount to serviceaccounts and make manifest to auto generate role.yaml

Copy link
Collaborator Author

@DmitriGekhtman DmitriGekhtman Jun 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turns out the plural form is the correct way to specify the resource name (compare to "pods" and "services" elsewhere in this file).
With "serviceaccount" (singular) it fails to grant the necessary permissions (which are used only to set up the autoscaler's service account)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need serviceaccount, we should update code

Thanks for pointing that out!! Will do.

verbs:
- create
- delete
Expand Down
2 changes: 1 addition & 1 deletion ray-operator/controllers/ray/raycluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type RayClusterReconciler struct {
// +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=services/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;create;update
// +kubebuilder:rbac:groups=core,resources=serviceaccount,verbs=get;list;watch;create;delete
// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;delete
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=roles,verbs=get;list;watch;create;delete;update
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=rolebindings,verbs=get;list;watch;create;delete
// Reconcile used to bridge the desired state with the current state
Expand Down
2 changes: 1 addition & 1 deletion ray-operator/controllers/ray/rayservice_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func NewRayServiceReconciler(mgr manager.Manager) *RayServiceReconciler {
// +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=services/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;create;update
// +kubebuilder:rbac:groups=core,resources=serviceaccount,verbs=get;list;watch;create;delete
// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;delete
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=roles,verbs=get;list;watch;create;delete;update
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=rolebindings,verbs=get;list;watch;create;delete

Expand Down