Introduce Quantity multiplication method

Signed-off-by: Yuki Iwai <[email protected]>
kubeflow · Apr 17, 2024 · e092ae9 · e092ae9
1 parent 9a029f0
commit e092ae9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/controller/podgroup.go b/pkg/controller/podgroup.go
@@ -375,10 +375,8 @@ func calPGMinResource(minMember *int32, mpiJob *kubeflow.MPIJob, pcLister schedu
  if rp.Replicas == nil {
  continue
  }
- for i := int32(0); i < *rp.Replicas; i++ {
- for _, c := range rp.Template.Spec.Containers {
- addResources(minResources, c.Resources)
- }
+ for _, c := range rp.Template.Spec.Containers {
+ addResources(minResources, c.Resources, int64(*rp.Replicas))
  }
  }
  return &minResources
@@ -414,7 +412,7 @@ func calculatePriorityClassName(
 
 // addResources adds resources to minResources.
 // If resources don't have requests, it defaults limit if that is explicitly specified.
-func addResources(minResources corev1.ResourceList, resources corev1.ResourceRequirements) {
+func addResources(minResources corev1.ResourceList, resources corev1.ResourceRequirements, replicas int64) {
  if minResources == nil || cmp.Equal(resources, corev1.ResourceRequirements{}) {
  return
  }
@@ -429,6 +427,7 @@ func addResources(minResources corev1.ResourceList, resources corev1.ResourceReq
  }
  }
  for name, quantity := range merged {
+ quantity.Mul(replicas)
  if q, ok := minResources[name]; !ok {
  minResources[name] = quantity.DeepCopy()
  } else {

diff --git a/pkg/controller/podgroup_test.go b/pkg/controller/podgroup_test.go
@@ -753,7 +753,7 @@ func TestAddResources(t *testing.T) {
  }
  for name, tc := range tests {
  t.Run(name, func(t *testing.T) {
- addResources(tc.minResources, tc.resources)
+ addResources(tc.minResources, tc.resources, 1)
  if diff := cmp.Diff(tc.want, tc.minResources); len(diff) != 0 {
  t.Fatalf("Unexpected resourceList (-want,+got):\n%s", diff)
  }