Merge branch 'master' of https://github.com/molei20021/volcano into v…

…olcano-node-resource-reservation-proposal
volcano-sh · Dec 19, 2024 · cffa3f7 · cffa3f7
2 parents 7cd29cb + dca4160
commit cffa3f7
Show file tree

Hide file tree

Showing 30 changed files with 537 additions and 593 deletions.
diff --git a/config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml b/config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml
@@ -58,6 +58,8 @@ spec:
                                   path:
                                     type: string
                                   port:
+                                    maximum: 65535
+                                    minimum: 0
                                     type: integer
                                   taskName:
                                     type: string
@@ -76,6 +78,8 @@ spec:
                               items:
                                 properties:
                                   port:
+                                    maximum: 65535
+                                    minimum: 0
                                     type: integer
                                   taskName:
                                     type: string
@@ -90,12 +94,16 @@ spec:
                           type: array
                       type: object
                     name:
+                      minLength: 1
                       type: string
                   required:
                   - name
                   type: object
                 type: array
               jobRetainPolicy:
+                enum:
+                - retain
+                - delete
                 type: string
             type: object
           status:

diff --git a/config/crd/jobflow/bases/flow.volcano.sh_jobtemplates.yaml b/config/crd/jobflow/bases/flow.volcano.sh_jobtemplates.yaml
@@ -29,6 +29,7 @@ spec:
           spec:
             properties:
               maxRetry:
+                default: 3
                 format: int32
                 type: integer
               minAvailable:
@@ -50,9 +51,33 @@ spec:
                     action:
                       type: string
                     event:
+                      enum:
+                      - '*'
+                      - PodPending
+                      - PodRunning
+                      - PodFailed
+                      - PodEvicted
+                      - Unknown
+                      - TaskCompleted
+                      - OutOfSync
+                      - CommandIssued
+                      - JobUpdated
+                      - TaskFailed
                       type: string
                     events:
                       items:
+                        enum:
+                        - '*'
+                        - PodPending
+                        - PodRunning
+                        - PodFailed
+                        - PodEvicted
+                        - Unknown
+                        - TaskCompleted
+                        - OutOfSync
+                        - CommandIssued
+                        - JobUpdated
+                        - TaskFailed
                         type: string
                       type: array
                     exitCode:
@@ -96,9 +121,33 @@ spec:
                           action:
                             type: string
                           event:
+                            enum:
+                            - '*'
+                            - PodPending
+                            - PodRunning
+                            - PodFailed
+                            - PodEvicted
+                            - Unknown
+                            - TaskCompleted
+                            - OutOfSync
+                            - CommandIssued
+                            - JobUpdated
+                            - TaskFailed
                             type: string
                           events:
                             items:
+                              enum:
+                              - '*'
+                              - PodPending
+                              - PodRunning
+                              - PodFailed
+                              - PodEvicted
+                              - Unknown
+                              - TaskCompleted
+                              - OutOfSync
+                              - CommandIssued
+                              - JobUpdated
+                              - TaskFailed
                               type: string
                             type: array
                           exitCode:
@@ -3739,6 +3788,11 @@ spec:
                           type: object
                       type: object
                     topologyPolicy:
+                      enum:
+                      - none
+                      - best-effort
+                      - restricted
+                      - single-numa-node
                       type: string
                   type: object
                 type: array

diff --git a/config/crd/volcano/bases/batch.volcano.sh_jobs.yaml b/config/crd/volcano/bases/batch.volcano.sh_jobs.yaml
@@ -47,6 +47,7 @@ spec:
           spec:
             properties:
               maxRetry:
+                default: 3
                 format: int32
                 type: integer
               minAvailable:
@@ -68,9 +69,33 @@ spec:
                     action:
                       type: string
                     event:
+                      enum:
+                      - '*'
+                      - PodPending
+                      - PodRunning
+                      - PodFailed
+                      - PodEvicted
+                      - Unknown
+                      - TaskCompleted
+                      - OutOfSync
+                      - CommandIssued
+                      - JobUpdated
+                      - TaskFailed
                       type: string
                     events:
                       items:
+                        enum:
+                        - '*'
+                        - PodPending
+                        - PodRunning
+                        - PodFailed
+                        - PodEvicted
+                        - Unknown
+                        - TaskCompleted
+                        - OutOfSync
+                        - CommandIssued
+                        - JobUpdated
+                        - TaskFailed
                         type: string
                       type: array
                     exitCode:
@@ -114,9 +139,33 @@ spec:
                           action:
                             type: string
                           event:
+                            enum:
+                            - '*'
+                            - PodPending
+                            - PodRunning
+                            - PodFailed
+                            - PodEvicted
+                            - Unknown
+                            - TaskCompleted
+                            - OutOfSync
+                            - CommandIssued
+                            - JobUpdated
+                            - TaskFailed
                             type: string
                           events:
                             items:
+                              enum:
+                              - '*'
+                              - PodPending
+                              - PodRunning
+                              - PodFailed
+                              - PodEvicted
+                              - Unknown
+                              - TaskCompleted
+                              - OutOfSync
+                              - CommandIssued
+                              - JobUpdated
+                              - TaskFailed
                               type: string
                             type: array
                           exitCode:
@@ -3757,6 +3806,11 @@ spec:
                           type: object
                       type: object
                     topologyPolicy:
+                      enum:
+                      - none
+                      - best-effort
+                      - restricted
+                      - single-numa-node
                       type: string
                   type: object
                 type: array

diff --git a/config/crd/volcano/bases/nodeinfo.volcano.sh_numatopologies.yaml b/config/crd/volcano/bases/nodeinfo.volcano.sh_numatopologies.yaml
@@ -46,10 +46,13 @@ spec:
                   description: CPUInfo is the cpu topology detail
                   properties:
                     core:
+                      minimum: 0
                       type: integer
                     numa:
+                      minimum: 0
                       type: integer
                     socket:
+                      minimum: 0
                       type: integer
                   type: object
                 description: |-

diff --git a/go.mod b/go.mod
@@ -31,22 +31,22 @@ require (
 	golang.org/x/sys v0.21.0
 	golang.org/x/time v0.3.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.31.1
-	k8s.io/apimachinery v0.31.1
-	k8s.io/apiserver v0.31.1
-	k8s.io/client-go v0.31.1
-	k8s.io/code-generator v0.31.1
-	k8s.io/component-base v0.31.1
-	k8s.io/component-helpers v0.31.1
-	k8s.io/csi-translation-lib v0.31.1
+	k8s.io/api v0.31.3
+	k8s.io/apimachinery v0.31.3
+	k8s.io/apiserver v0.31.3
+	k8s.io/client-go v0.31.3
+	k8s.io/code-generator v0.31.3
+	k8s.io/component-base v0.31.3
+	k8s.io/component-helpers v0.31.3
+	k8s.io/csi-translation-lib v0.31.3
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubernetes v1.31.1
+	k8s.io/kubernetes v1.31.3
 	k8s.io/metrics v0.0.0
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/controller-runtime v0.13.0
 	sigs.k8s.io/yaml v1.4.0
 	stathat.com/c/consistent v1.0.0
-	volcano.sh/apis v1.10.0-alpha.0.0.20241016111016-bb93758bd51f
+	volcano.sh/apis v1.10.0-alpha.0.0.20241210014034-bf27f4e986d0
 )
 
 require (
@@ -60,7 +60,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
-	k8s.io/cri-api v0.31.1 // indirect
+	k8s.io/cri-api v0.31.3 // indirect
 	k8s.io/cri-client v0.0.0 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
 )
@@ -143,8 +143,8 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.25.0 // indirect
 	k8s.io/cloud-provider v0.0.0 // indirect
-	k8s.io/controller-manager v0.31.1
-	k8s.io/kms v0.31.1 // indirect
+	k8s.io/controller-manager v0.31.3
+	k8s.io/kms v0.31.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/kube-scheduler v0.0.0 // indirect
 	k8s.io/kubelet v0.0.0 // indirect
@@ -160,34 +160,34 @@ replace (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
 	google.golang.org/grpc => google.golang.org/grpc v1.57.0
 	k8s.io/api => k8s.io/api v0.31.1
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
-	k8s.io/apiserver => k8s.io/apiserver v0.31.1
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
-	k8s.io/client-go => k8s.io/client-go v0.31.1
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1
-	k8s.io/code-generator => k8s.io/code-generator v0.31.1
-	k8s.io/component-base => k8s.io/component-base v0.31.1
-	k8s.io/component-helpers => k8s.io/component-helpers v0.31.1
-	k8s.io/controller-manager => k8s.io/controller-manager v0.31.1
-	k8s.io/cri-api => k8s.io/cri-api v0.31.1
-	k8s.io/cri-client => k8s.io/cri-client v0.31.1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1
-	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1
-	k8s.io/endpointslice => k8s.io/endpointslice v0.31.1
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1
-	k8s.io/kubectl => k8s.io/kubectl v0.31.1
-	k8s.io/kubelet => k8s.io/kubelet v0.31.1
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.1
-	k8s.io/metrics => k8s.io/metrics v0.31.1
-	k8s.io/mount-utils => k8s.io/mount-utils v0.31.1
-	k8s.io/node-api => k8s.io/node-api v0.31.1
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.1
-	k8s.io/sample-controller => k8s.io/sample-controller v0.31.1
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
+	k8s.io/apiserver => k8s.io/apiserver v0.31.3
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
+	k8s.io/client-go => k8s.io/client-go v0.31.3
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
+	k8s.io/code-generator => k8s.io/code-generator v0.31.3
+	k8s.io/component-base => k8s.io/component-base v0.31.3
+	k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
+	k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
+	k8s.io/cri-api => k8s.io/cri-api v0.31.3
+	k8s.io/cri-client => k8s.io/cri-client v0.31.3
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
+	k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
+	k8s.io/kubectl => k8s.io/kubectl v0.31.3
+	k8s.io/kubelet => k8s.io/kubelet v0.31.3
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
+	k8s.io/metrics => k8s.io/metrics v0.31.3
+	k8s.io/mount-utils => k8s.io/mount-utils v0.31.3
+	k8s.io/node-api => k8s.io/node-api v0.31.3
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3
+	k8s.io/sample-controller => k8s.io/sample-controller v0.31.3
 )