Skip to content

Read res req from custom pod res #218

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 7 commits into from
Aug 30, 2022
Merged

Read res req from custom pod res #218

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2982c0d
read res req from custom pod res
asm582 Aug 30, 2022
e790ff9
make changes backward compatible
asm582 Aug 30, 2022
061bf04
Test cases for CustomPodResources.
dmatch01 Aug 30, 2022
f521d8d
Merge pull request #1 from asm582/cust_pod_res_mod1
asm582 Aug 30, 2022
512a335
Fix to test case conditions.
dmatch01 Aug 30, 2022
8e15736
Uptick mod version.
dmatch01 Aug 30, 2022
289701b
Merge pull request #2 from asm582/cust_pod_res_mod2
asm582 Aug 30, 2022
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
Prev Previous commit
Next Next commit
make changes backward compatible
  • Loading branch information
@asm582
asm582 committed Aug 30, 2022
commit e790ff9962fb4f81816a6841c13ad7ee0e488452
22 changes: 17 additions & 5 deletions pkg/controller/queuejobresources/genericresource/genericresource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,24 @@ func GetResources(awr *arbv1.AppWrapperGenericResource) (resource *clusterstatea
var err error
err = nil
if awr.GenericTemplate.Raw != nil {
podresources := awr.CustomPodResources
for _, item := range podresources {
res := getPodResources(item)
totalresource = totalresource.Add(res)
if len(awr.CustomPodResources) > 0 {
podresources := awr.CustomPodResources
for _, item := range podresources {
res := getPodResources(item)
totalresource = totalresource.Add(res)
}
klog.V(4).Infof("[GetResources] Requested total allocation resource from custompodresources `%v`.\n", totalresource)
return totalresource, err
}
hasContainer, replicas, containers := hasFields(awr.GenericTemplate)
if hasContainer {
for _, item := range containers {
res := getContainerResources(item, replicas)
totalresource = totalresource.Add(res)
}
klog.V(4).Infof("[GetResources] Requested total allocation resource from containers `%v`.\n", totalresource)
return totalresource, err
}
klog.V(4).Infof("[GetResources] Requested total allocation resource from pods `%v`.\n", totalresource)

} else {
err = fmt.Errorf("generic template raw object is not defined (nil)")
Expand Down