Skip to content

adjust rbac to match mcad #240

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
Closed
wants to merge 22 commits into from
Closed

adjust rbac to match mcad #240

wants to merge 22 commits into from

Conversation

jbusche
Copy link
Collaborator

@jbusche jbusche commented Aug 17, 2023 •
edited
Loading

Issue link

Closes #187

What changes have been made

Adjusts the mcad_controller.go rbac rules to match the recent changes with MCAD in PR project-codeflare/multi-cluster-app-dispatcher#475

Verification steps

TBD

Checks

  • I've made sure the tests are passing.
  • Testing Strategy
    • Unit tests
    • Manual tests
    • Testing is not required for this change

@jbusche
adjust rbac to match mcad
5ae13d1 
Signed-off-by: James Busche <[email protected]>
@openshift-ci
Copy link

openshift-ci bot commented Aug 17, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from jbusche. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

jbusche added 3 commits August 17, 2023 10:16
@jbusche
revert go.mod and go.sum
dcac680 
Signed-off-by: James Busche <[email protected]>
@jbusche
regenerate of role
67d902d 
Signed-off-by: James Busche <[email protected]>
@jbusche
more info on make manifests
1e3f7dc 
Signed-off-by: James Busche <[email protected]>
@jbusche jbusche mentioned this pull request Aug 17, 2023
Closed
@jbusche
Copy link
Collaborator Author

jbusche commented Aug 17, 2023

OK - i built a new operator image and tried deploying it:

oc get pod -n openshift-operators |grep codeflare
codeflare-operator-manager-59b49cf5b7-bdx2d                1/1     Running   1 (52m ago)   64m

Using my test image:

oc describe pod codeflare-operator-manager-59b49cf5b7-bdx2d -n openshift-operators |grep Image:
    Image:         quay.io/jbusche/pr187:rc2

And it's looking good - able to deploy samples and not seeing any error:

oc get pods -n default
NAME                                                              READY   STATUS      RESTARTS   AGE
jobtest-head-bb4ls                                                1/1     Running     0          5m25s
jobtest-worker-small-group-jobtest-ghfpq                          1/1     Running     0          5m25s
jobtest-worker-small-group-jobtest-zs52h                          1/1     Running     0          5m24s

@jbusche jbusche marked this pull request as ready for review August 17, 2023 20:49
@openshift-ci openshift-ci bot requested review from dimakis and KPostOffice August 17, 2023 20:49
sutaakar and others added 16 commits September 5, 2023 15:55
@sutaakar @jbusche
Apply MCAD CRD version replace for operator uninstall and undeploy
c62b9b2
@sutaakar @jbusche
Test support: return default status if Route is not initialized
3eeb618
@sutaakar @jbusche
Test support: return error if Ray API response code doesn't match
fd58cf7
@sutaakar @jbusche
Test support: Return WriteRayJobLogs function
50ccd1a
@dependabot @jbusche
build(deps): bump github.com/onsi/gomega from 1.27.8 to 1.27.10
be418f7 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.8 to 1.27.10.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.27.8...v1.27.10)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@anishasthana @jbusche
Update dependency versions for release v0.2.0
e9e4b85
@anishasthana @jbusche
Automatically label issues as needing triage and add them to project …
4d1e0b4 
…board

Signed-off-by: Anish Asthana <[email protected]>
@Fiona-Waters @jbusche
Fixing instascale version
004d0e9
@anishasthana @jbusche
Update dependency versions for release v0.2.2
ed54c77
@sutaakar @jbusche
e2e tests: Reduce CPU requests for e2e test AppWrappers
652510f
@anishasthana @jbusche
Change remaining is-latest references to stable
a0f7e7c 
Signed-off-by: Anish Asthana <[email protected]>
@sutaakar @jbusche
Release workflow - replace any version value in Makefile
e3c3114
@ChristianZaccaria @jbusche
Remove custom-metrics-api
02e7425
@astefanutti @jbusche
Move AppWrapper API to workload.codeflare.dev group
a4eb235
@jbusche
adjust rbac to match mcad
a204198 
Signed-off-by: James Busche <[email protected]>
@jbusche
revert go.mod and go.sum
e5d10a7 
Signed-off-by: James Busche <[email protected]>
@jbusche
config/rbac/role.yaml
de7ed65 
Signed-off-by: James Busche <[email protected]>
@jbusche
Copy link
Collaborator Author

jbusche commented Sep 5, 2023

/retest

@jbusche
Copy link
Collaborator Author

jbusche commented Sep 6, 2023

Please hold:
Tried another deploy:

  • Made the image and pushed it to quay
  • built the operator with my manual image
  • Deploying the codeflare-stack kfdef worked

I'm testing now - but seeing something goofy... not sure if it's with my PR or if it's something in the latest code.

@jbusche
Copy link
Collaborator Author

jbusche commented Sep 7, 2023

OK - it looks good to me:
My Manual operator image built and deployed fine - looks just like the regular one
Deploying the sample appwrappers looked ok.
Deploying the performance test appwrappers looked ok (Need to make a tweak on the perf script, that'll be in another PR later for MCAD)
@sutaakar do you think this looks good to merge?

astefanutti
astefanutti reviewed Sep 7, 2023
View reviewed changes
Copy link
Contributor

@astefanutti astefanutti left a comment

Choose a reason for hiding this comment

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

It seems there are some extra commits. Could you please rebase it properly?

controllers/mcad_controller.go
@@ -102,7 +102,7 @@ func (r *MCADReconciler) DeleteResource(params *MCADParams, template string, fns
// +kubebuilder:rbac:groups=codeflare.codeflare.dev,resources=mcads,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=codeflare.codeflare.dev,resources=mcads/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=codeflare.codeflare.dev,resources=mcads/finalizers,verbs=update
// +kubebuilder:rbac:groups=workload.codeflare.dev,resources=queuejobs;schedulingspecs;appwrappers;appwrappers/finalizers;appwrappers/status,verbs=get;list;watch;create;update;patch;delete;deletecollection
// +kubebuilder:rbac:groups=workload.codeflare.dev,resources=xqueuejobs;queuejobs;schedulingspecs;appwrappers;appwrappers/finalizers;appwrappers/status;quotasubtrees,verbs=get;list;watch;create;update;patch;delete;deletecollection
Copy link
Contributor

Choose a reason for hiding this comment

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

I think xqueuejobs CRD has been removed from recent MCAD versions.

@jbusche
Copy link
Collaborator Author

jbusche commented Sep 11, 2023

Sure - let me close this and restart - there have been a lot of code changes recently - apparently my rebase wasn't correct.

@jbusche jbusche closed this Sep 11, 2023
@jbusche jbusche deleted the jb-187-quotatree branch October 16, 2023 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@astefanutti astefanutti astefanutti left review comments

@dimakis dimakis Awaiting requested review from dimakis

@KPostOffice KPostOffice Awaiting requested review from KPostOffice

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Adjust the operator kubebuilder mcad roles for quota trees PR
7 participants
@jbusche @astefanutti @openshift-merge-robot @sutaakar @anishasthana @Fiona-Waters @ChristianZaccaria