Skip to content

add role for quota subtrees #475

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

Merged
merged 3 commits into from
Jul 21, 2023
Merged

add role for quota subtrees #475

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d4dd50
add role for qst
asm582 Jul 12, 2023
25b3397
hack to enable preemption
asm582 Jul 18, 2023
1f8801b
Revert "hack to enable preemption"
asm582 Jul 20, 2023
File filter

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: 2 additions & 0 deletions deployment/mcad-controller/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,15 @@ metadata:
rules:
- apiGroups:
- mcad.ibm.com
- ibm.com
resources:
- xqueuejobs
- queuejobs
- schedulingspecs
- appwrappers
- appwrappers/finalizers
- appwrappers/status
- quotasubtrees
verbs:
- create
- delete
Expand Down
9 changes: 8 additions & 1 deletion pkg/controller/quota/quotaforestmanager/qm_lib_backend_with_quotasubt_mgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,14 @@ func (qm *QuotaManager) Fits(aw *arbv1.AppWrapper, awResDemands *clusterstateapi
qm.removeConsumer(consumerID)
return doesFit, preemptIds, strings.TrimSpace(allocResponse.GetMessage())
}
preemptIds = qm.getAppWrappers(allocResponse.GetPreemptedIds())
if len(allocResponse.GetPreemptedIds()) > 0 {
preemptIds = qm.getAppWrappers(allocResponse.GetPreemptedIds())
} else {
var s []string
s = append(s, allocResponse.GetConsumerID())
preemptIds = qm.getAppWrappers(s)
}

return doesFit, preemptIds, strings.TrimSpace(allocResponse.GetMessage())
}

Expand Down