update jobset to 0.6.0 (kubernetes-sigs#3034)

KunWuLuan · Sep 12, 2024 · 0b39238 · 0b39238
1 parent b44ff55
commit 0b39238
Show file tree

Hide file tree

Showing 12 changed files with 551 additions and 30 deletions.
diff --git a/go.mod b/go.mod
@@ -30,7 +30,7 @@ require (
 	k8s.io/metrics v0.31.1
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/controller-runtime v0.19.0
-	sigs.k8s.io/jobset v0.5.2
+	sigs.k8s.io/jobset v0.6.0
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 	sigs.k8s.io/yaml v1.4.0
 )

diff --git a/go.sum b/go.sum
@@ -435,8 +435,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsA
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
 sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
 sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/jobset v0.5.2 h1:276q5Pi/ErLYj+GQ0ydEXR6tx3LwBhEzHLQv+k8bYF4=
-sigs.k8s.io/jobset v0.5.2/go.mod h1:Vg99rj/6OoGvy1uvywGEHOcVLCWWJYkJtisKqdWzcFw=
+sigs.k8s.io/jobset v0.6.0 h1:s5laI2rXo4CZ/I/GvG9aRlWwUnGntrV7MMtPNC1UtoU=
+sigs.k8s.io/jobset v0.6.0/go.mod h1:lOpd2X6PFNiz03N4g1NipmDH5G1Ck53Yz2CRy8zaxt8=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/kustomize/api v0.17.3 h1:6GCuHSsxq7fN5yhF2XrC+AAr8gxQwhexgHflOAD/JJU=

diff --git a/hack/internal/tools/go.mod b/hack/internal/tools/go.mod
@@ -148,7 +148,7 @@ require (
 	k8s.io/kubectl v0.31.1 // indirect
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/controller-runtime v0.19.0 // indirect
-	sigs.k8s.io/jobset v0.5.2 // indirect
+	sigs.k8s.io/jobset v0.6.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kustomize/api v0.17.3 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect

diff --git a/hack/internal/tools/go.sum b/hack/internal/tools/go.sum
@@ -533,8 +533,8 @@ sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240813183042-b901db1
 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240813183042-b901db121e1f/go.mod h1:IaDsO8xSPRxRG1/rm9CP7+jPmj0nMNAuNi/yiHnLX8k=
 sigs.k8s.io/controller-tools v0.16.1 h1:gvIsZm+2aimFDIBiDKumR7EBkc+oLxljoUVfRbDI6RI=
 sigs.k8s.io/controller-tools v0.16.1/go.mod h1:0I0xqjR65YTfoO12iR+mZR6s6UAVcUARgXRlsu0ljB0=
-sigs.k8s.io/jobset v0.5.2 h1:276q5Pi/ErLYj+GQ0ydEXR6tx3LwBhEzHLQv+k8bYF4=
-sigs.k8s.io/jobset v0.5.2/go.mod h1:Vg99rj/6OoGvy1uvywGEHOcVLCWWJYkJtisKqdWzcFw=
+sigs.k8s.io/jobset v0.6.0 h1:s5laI2rXo4CZ/I/GvG9aRlWwUnGntrV7MMtPNC1UtoU=
+sigs.k8s.io/jobset v0.6.0/go.mod h1:lOpd2X6PFNiz03N4g1NipmDH5G1Ck53Yz2CRy8zaxt8=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/kind v0.23.0 h1:8fyDGWbWTeCcCTwA04v4Nfr45KKxbSPH1WO9K+jVrBg=

diff --git a/site/content/en/docs/tasks/manage/setup_multikueue.md b/site/content/en/docs/tasks/manage/setup_multikueue.md
@@ -69,13 +69,13 @@ kubectl config use-context manager-cluster
 
 If you are using Kueue in version 0.7.0 or newer install the JobSet on the
 management cluster (see [JobSet Installation](https://jobset.sigs.k8s.io/docs/installation/)
-for more details). Please install JobSet 0.5.1 or newer for MultiKueue.
+for more details). Please install JobSet 0.6.0 or newer for MultiKueue.
 
 {{% alert title="Warning" color="warning" %}}
 If you are using an older version of Kueue than 0.7.0, only install the JobSet
 CRD in the management cluster. You can do this by running:
 ```bash
-kubectl apply --server-side -f https://raw.githubusercontent.com/kubernetes-sigs/jobset/v0.5.1/config/components/crd/bases/jobset.x-k8s.io_jobsets.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/kubernetes-sigs/jobset/v0.6.0/config/components/crd/bases/jobset.x-k8s.io_jobsets.yaml
 ```
 {{% /alert %}}
 

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1542,10 +1542,11 @@ sigs.k8s.io/controller-runtime/pkg/webhook/admission
 sigs.k8s.io/controller-runtime/pkg/webhook/admission/metrics
 sigs.k8s.io/controller-runtime/pkg/webhook/conversion
 sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics
-# sigs.k8s.io/jobset v0.5.2
-## explicit; go 1.22
+# sigs.k8s.io/jobset v0.6.0
+## explicit; go 1.22.0
 sigs.k8s.io/jobset/api/jobset/v1alpha2
 sigs.k8s.io/jobset/pkg/constants
+sigs.k8s.io/jobset/pkg/util/collections
 sigs.k8s.io/jobset/pkg/util/testing
 # sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
 ## explicit; go 1.18

diff --git a/vendor/sigs.k8s.io/jobset/api/jobset/v1alpha2/jobset_types.go b/vendor/sigs.k8s.io/jobset/api/jobset/v1alpha2/jobset_types.go