Skip to content

Commit 94e98c8

Browse files
authored
Replace Kueue PodRequests helper with core k/k one (#2461)
Signed-off-by: Yuki Iwai <[email protected]>
1 parent 3c6c90f commit 94e98c8

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ require (
1414
k8s.io/apimachinery v0.32.2
1515
k8s.io/client-go v0.32.2
1616
k8s.io/code-generator v0.32.2
17+
k8s.io/component-helpers v0.32.2
1718
k8s.io/klog/v2 v2.130.1
1819
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
1920
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2021
sigs.k8s.io/controller-runtime v0.20.2
2122
sigs.k8s.io/jobset v0.8.0-devel.0.20250212132206-c69f95cd53b4
22-
sigs.k8s.io/kueue v0.6.3
2323
sigs.k8s.io/scheduler-plugins v0.30.6
2424
sigs.k8s.io/structured-merge-diff/v4 v4.5.0
2525
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
178178
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
179179
k8s.io/code-generator v0.32.2 h1:CIvyPrLWP7cMgrqval2qYT839YAwCDeSvGfXgWSNpHQ=
180180
k8s.io/code-generator v0.32.2/go.mod h1:plh7bWk7JztAUkHM4zpbdy0KOMdrhsePcZL2HLWFH7Y=
181+
k8s.io/component-helpers v0.32.2 h1:2usSAm3zNE5yu5DdAdrKBWLfSYNpU4OPjZywJY5ovP8=
182+
k8s.io/component-helpers v0.32.2/go.mod h1:fvQAoiiOP7jUEUBc9qR0PXiBPuB0I56WTxTkkpcI8g8=
181183
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4=
182184
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
183185
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -194,8 +196,6 @@ sigs.k8s.io/jobset v0.8.0-devel.0.20250212132206-c69f95cd53b4 h1:f4fx7+T4Bp6v+nF
194196
sigs.k8s.io/jobset v0.8.0-devel.0.20250212132206-c69f95cd53b4/go.mod h1:egRLNm7qi4s1cj+sPvleUagDF5icYb7UH4FwGlni6+Q=
195197
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
196198
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
197-
sigs.k8s.io/kueue v0.6.3 h1:PmccdKPDFQIaAboyuSG6M0w6hXtxVA51RV+DjCUtBtQ=
198-
sigs.k8s.io/kueue v0.6.3/go.mod h1:rliYfK/K7pJ7CT4ReV1szzciNkAo3sBn5Bmr5Sn6uCY=
199199
sigs.k8s.io/scheduler-plugins v0.30.6 h1:P4pViMVoyVNHWmkG96UtJ4LvxkUIeenIUKLZd09vDyw=
200200
sigs.k8s.io/scheduler-plugins v0.30.6/go.mod h1:EDYYqHmpHR//VYKAeud1TTQbTFSvpdGFeyEg9ejOmnI=
201201
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=

pkg/runtime/runtime.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
corev1 "k8s.io/api/core/v1"
2323
corev1ac "k8s.io/client-go/applyconfigurations/core/v1"
24-
kueuelr "sigs.k8s.io/kueue/pkg/util/limitrange"
24+
resourcehelpers "k8s.io/component-helpers/resource"
2525

2626
trainer "github.com/kubeflow/trainer/pkg/apis/trainer/v1alpha1"
2727
)
@@ -109,7 +109,7 @@ func WithPodSpecReplicas(replicaName string, replicas int32, podSpec corev1.PodS
109109
o.podSpecReplicas = append(o.podSpecReplicas, podSpecReplica{
110110
name: replicaName,
111111
replicas: replicas,
112-
podSpec: podSpec,
112+
podSpec: *podSpec.DeepCopy(),
113113
})
114114
}
115115
}
@@ -131,9 +131,8 @@ func NewInfo(opts ...InfoOption) *Info {
131131

132132
for _, spec := range options.podSpecReplicas {
133133
info.TotalRequests[spec.name] = TotalResourceRequest{
134-
Replicas: spec.replicas,
135-
// TODO: Need to address LimitRange and RuntimeClass.
136-
PodRequests: kueuelr.TotalRequests(&spec.podSpec),
134+
Replicas: spec.replicas,
135+
PodRequests: resourcehelpers.PodRequests(&corev1.Pod{Spec: spec.podSpec}, resourcehelpers.PodResourcesOptions{}),
137136
}
138137
}
139138
if options.labels != nil {

0 commit comments

Comments
 (0)