Skip to content

Commit 352c795

Browse files
andreyvelichandreyvelich
authored
Bump JobSet to v0.8.0 (#2463)
Signed-off-by: Andrey Velichkevich <[email protected]>
1 parent 94e98c8 commit 352c795

File tree

12 files changed

+32
-63
lines changed

12 files changed

+32
-63
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ LOCALBIN ?= $(PROJECT_DIR)/bin
3636
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
3737
ENVTEST ?= $(LOCALBIN)/setup-envtest
3838

39-
ENVTEST_K8S_VERSION ?= 1.31
39+
ENVTEST_K8S_VERSION ?= 1.32
4040

4141
# Instructions to download tools for development.
4242
.PHONY: envtest

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
github.com/go-logr/logr v1.4.2
7-
github.com/google/go-cmp v0.6.0
7+
github.com/google/go-cmp v0.7.0
88
github.com/onsi/ginkgo/v2 v2.22.2
99
github.com/onsi/gomega v1.36.2
1010
github.com/open-policy-agent/cert-controller v0.12.0
@@ -19,7 +19,7 @@ require (
1919
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
2020
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2121
sigs.k8s.io/controller-runtime v0.20.2
22-
sigs.k8s.io/jobset v0.8.0-devel.0.20250212132206-c69f95cd53b4
22+
sigs.k8s.io/jobset v0.8.0
2323
sigs.k8s.io/scheduler-plugins v0.30.6
2424
sigs.k8s.io/structured-merge-diff/v4 v4.5.0
2525
)
@@ -46,23 +46,23 @@ require (
4646
github.com/google/uuid v1.6.0 // indirect
4747
github.com/josharian/intern v1.0.0 // indirect
4848
github.com/json-iterator/go v1.1.12 // indirect
49-
github.com/klauspost/compress v1.17.9 // indirect
49+
github.com/klauspost/compress v1.17.11 // indirect
5050
github.com/mailru/easyjson v0.7.7 // indirect
5151
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5252
github.com/modern-go/reflect2 v1.0.2 // indirect
5353
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5454
github.com/pkg/errors v0.9.1 // indirect
55-
github.com/prometheus/client_golang v1.20.5 // indirect
55+
github.com/prometheus/client_golang v1.21.0 // indirect
5656
github.com/prometheus/client_model v0.6.1 // indirect
57-
github.com/prometheus/common v0.55.0 // indirect
57+
github.com/prometheus/common v0.62.0 // indirect
5858
github.com/prometheus/procfs v0.15.1 // indirect
5959
github.com/spf13/pflag v1.0.5 // indirect
6060
github.com/x448/float16 v0.8.4 // indirect
6161
go.uber.org/atomic v1.11.0 // indirect
6262
go.uber.org/multierr v1.11.0 // indirect
6363
golang.org/x/mod v0.22.0 // indirect
6464
golang.org/x/net v0.33.0 // indirect
65-
golang.org/x/oauth2 v0.23.0 // indirect
65+
golang.org/x/oauth2 v0.24.0 // indirect
6666
golang.org/x/sync v0.10.0 // indirect
6767
golang.org/x/sys v0.28.0 // indirect
6868
golang.org/x/term v0.27.0 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76
3737
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
3838
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
3939
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
40-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
41-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
40+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
41+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
4242
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4343
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
4444
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -52,8 +52,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
5252
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
5353
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
5454
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
55-
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
56-
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
55+
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
56+
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
5757
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
5858
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
5959
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -82,12 +82,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
8282
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8383
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
8484
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
85-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
86-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
85+
github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
86+
github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
8787
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
8888
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
89-
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
90-
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
89+
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
90+
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
9191
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
9292
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
9393
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
@@ -125,8 +125,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
125125
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
126126
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
127127
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
128-
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
129-
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
128+
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
129+
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
130130
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
131131
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
132132
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -192,8 +192,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
192192
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
193193
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
194194
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
195-
sigs.k8s.io/jobset v0.8.0-devel.0.20250212132206-c69f95cd53b4 h1:f4fx7+T4Bp6v+nFs5bCPq/py+Xt6DYEHbWhF/CRkAUQ=
196-
sigs.k8s.io/jobset v0.8.0-devel.0.20250212132206-c69f95cd53b4/go.mod h1:egRLNm7qi4s1cj+sPvleUagDF5icYb7UH4FwGlni6+Q=
195+
sigs.k8s.io/jobset v0.8.0 h1:80cJcPld+IMdKFOqzEW4et3Y6lGAPcP8YmBZ+aiKGYA=
196+
sigs.k8s.io/jobset v0.8.0/go.mod h1:yitjuGOExl2p964nhyevQGIkfiPSRHcdC3zNBneKCT8=
197197
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
198198
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
199199
sigs.k8s.io/scheduler-plugins v0.30.6 h1:P4pViMVoyVNHWmkG96UtJ4LvxkUIeenIUKLZd09vDyw=

‎manifests/base/rbac/role.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ rules:
1313
- create
1414
- get
1515
- list
16+
- patch
1617
- update
1718
- watch
1819
- apiGroups:
@@ -32,6 +33,8 @@ rules:
3233
- create
3334
- get
3435
- list
36+
- patch
37+
- update
3538
- watch
3639
- apiGroups:
3740
- scheduling.x-k8s.io
@@ -41,6 +44,8 @@ rules:
4144
- create
4245
- get
4346
- list
47+
- patch
48+
- update
4449
- watch
4550
- apiGroups:
4651
- trainer.kubeflow.org

‎manifests/third-party/jobset/jobset_manager_config.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎manifests/third-party/jobset/kustomization.yaml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- https://github.com/kubernetes-sigs/jobset/releases/download/v0.7.3/manifests.yaml
6-
7-
# Config for the JobSet manager.
8-
configMapGenerator:
9-
- name: jobset-manager-config
10-
files:
11-
- jobset_manager_config.yaml
12-
options:
13-
disableNameSuffixHash: true
5+
- https://github.com/kubernetes-sigs/jobset/releases/download/v0.8.0/manifests.yaml
146

157
# Add required patches.
168
patches:
@@ -20,9 +12,3 @@ patches:
2012
group: ""
2113
version: v1
2214
kind: Namespace
23-
# Add custom manager config to the JobSet.
24-
- path: patches/jobset_config_patch.yaml
25-
target:
26-
group: apps
27-
version: v1
28-
kind: Deployment

‎manifests/third-party/jobset/patches/jobset_config_patch.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎pkg/controller/trainjob_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func NewTrainJobReconciler(client client.Client, recorder record.EventRecorder,
6868
}
6969
}
7070

71-
// +kubebuilder:rbac:groups=trainer.kubeflow.org,resources=trainjobs,verbs=get;list;watch;create;update;patch;delete
71+
// +kubebuilder:rbac:groups=trainer.kubeflow.org,resources=trainjobs,verbs=create;get;list;watch;update;patch;delete
7272
// +kubebuilder:rbac:groups=trainer.kubeflow.org,resources=trainjobs/status,verbs=get;update;patch
7373
// +kubebuilder:rbac:groups=trainer.kubeflow.org,resources=trainjobs/finalizers,verbs=get;update;patch
7474

‎pkg/runtime/framework/plugins/coscheduling/coscheduling.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var (
6868

6969
const Name = "CoScheduling"
7070

71-
// +kubebuilder:rbac:groups=scheduling.x-k8s.io,resources=podgroups,verbs=get;list;watch;create
71+
// +kubebuilder:rbac:groups=scheduling.x-k8s.io,resources=podgroups,verbs=create;get;list;watch;update;patch
7272

7373
func New(ctx context.Context, client client.Client, indexer client.FieldIndexer) (framework.Plugin, error) {
7474
if err := indexer.IndexField(ctx, &trainer.TrainingRuntime{}, TrainingRuntimeContainerRuntimeClassKey,

‎pkg/runtime/framework/plugins/jobset/jobset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var _ framework.TerminalConditionPlugin = (*JobSet)(nil)
5757

5858
const Name = constants.JobSetKind
5959

60-
// +kubebuilder:rbac:groups=jobset.x-k8s.io,resources=jobsets,verbs=get;list;watch;create
60+
// +kubebuilder:rbac:groups=jobset.x-k8s.io,resources=jobsets,verbs=create;get;list;watch;update;patch
6161

6262
func New(ctx context.Context, client client.Client, _ client.FieldIndexer) (framework.Plugin, error) {
6363
return &JobSet{

‎pkg/runtime/framework/plugins/mpi/mpi.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ var _ framework.ComponentBuilderPlugin = (*MPI)(nil)
5858

5959
const Name = "MPI"
6060

61-
// +kubebuilder:rbac:groups="",resources=secrets,verbs=create;get;list;update;watch
62-
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=create;get;list;update;watch
61+
// +kubebuilder:rbac:groups="",resources=secrets,verbs=create;get;list;watch;update;patch
62+
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=create;get;list;watch;update;patch
6363

6464
func New(_ context.Context, client client.Client, _ client.FieldIndexer) (framework.Plugin, error) {
6565
return &MPI{

‎sdk/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ classifiers = [
3131
]
3232
dependencies = [
3333
"kubernetes>=27.2.0",
34-
"jobset @ git+https://github.com/kubernetes-sigs/[email protected]#subdirectory=sdk/python",
34+
"pydantic>=2.10.0",
35+
"jobset @ git+https://github.com/kubernetes-sigs/[email protected]#subdirectory=sdk/python",
3536
]
3637

3738
[project.urls]

0 commit comments

Comments
 (0)