[fix]add queue.spec.Affinity

Signed-off-by: qiankunli <[email protected]> [fix]add queue.spec.Affinity Signed-off-by: qiankunli <[email protected]> update apis dependency commit to edd428c7d2fd Signed-off-by: qiankunli <[email protected]>
volcano-sh · Jul 5, 2022 · 93f7cdf · 93f7cdf
1 parent 57e90ac
commit 93f7cdf
Show file tree

Hide file tree

Showing 70 changed files with 3,049 additions and 153 deletions.
diff --git a/config/crd/bases/batch.volcano.sh_jobs.yaml b/config/crd/bases/batch.volcano.sh_jobs.yaml
@@ -32,6 +32,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: AGE
       type: date
+    - jsonPath: .spec.queue
+      name: QUEUE
+      priority: 1
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:

diff --git a/config/crd/bases/scheduling.volcano.sh_podgroups.yaml b/config/crd/bases/scheduling.volcano.sh_podgroups.yaml
@@ -19,7 +19,24 @@ spec:
     singular: podgroup
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: STATUS
+      type: string
+    - jsonPath: .spec.minMember
+      name: minMember
+      type: integer
+    - jsonPath: .status.running
+      name: RUNNINGS
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    - jsonPath: .spec.queue
+      name: QUEUE
+      priority: 1
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: PodGroup is a collection of Pod; used for batch workload.
@@ -132,6 +149,7 @@ spec:
         type: object
     served: true
     storage: true
+    subresources: {}
 status:
   acceptedNames:
     kind: ""

diff --git a/config/crd/bases/scheduling.volcano.sh_queues.yaml b/config/crd/bases/scheduling.volcano.sh_queues.yaml
@@ -40,6 +40,39 @@ spec:
             description: 'Specification of the desired behavior of the queue. More
               info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
             properties:
+              affinity:
+                description: If specified, the pod owned by the queue will be scheduled
+                  with constraint
+                properties:
+                  nodeGroupAffinity:
+                    description: Describes nodegroup affinity scheduling rules for
+                      the queue(e.g. putting pods of the queue in the nodes of the
+                      nodegroup)
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  nodeGroupAntiAffinity:
+                    description: Describes nodegroup anti-affinity scheduling rules
+                      for the queue(e.g. avoid putting pods of the queue in the nodes
+                      of the nodegroup).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               capability:
                 additionalProperties:
                   anyOf:

diff --git a/config/crd/v1beta1/batch.volcano.sh_jobs.yaml b/config/crd/v1beta1/batch.volcano.sh_jobs.yaml
@@ -21,6 +21,10 @@ spec:
   - JSONPath: .metadata.creationTimestamp
     name: AGE
     type: date
+  - JSONPath: .spec.queue
+    name: QUEUE
+    priority: 1
+    type: string
   group: batch.volcano.sh
   names:
     kind: Job

diff --git a/config/crd/v1beta1/scheduling.volcano.sh_podgroups.yaml b/config/crd/v1beta1/scheduling.volcano.sh_podgroups.yaml
@@ -8,6 +8,23 @@ metadata:
   creationTimestamp: null
   name: podgroups.scheduling.volcano.sh
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.phase
+    name: STATUS
+    type: string
+  - JSONPath: .spec.minMember
+    name: minMember
+    type: integer
+  - JSONPath: .status.running
+    name: RUNNINGS
+    type: integer
+  - JSONPath: .metadata.creationTimestamp
+    name: AGE
+    type: date
+  - JSONPath: .spec.queue
+    name: QUEUE
+    priority: 1
+    type: string
   group: scheduling.volcano.sh
   names:
     kind: PodGroup
@@ -18,6 +35,7 @@ spec:
     - podgroup-v1beta1
     singular: podgroup
   scope: Namespaced
+  subresources: {}
   validation:
     openAPIV3Schema:
       description: PodGroup is a collection of Pod; used for batch workload.

diff --git a/config/crd/v1beta1/scheduling.volcano.sh_queues.yaml b/config/crd/v1beta1/scheduling.volcano.sh_queues.yaml
@@ -40,6 +40,38 @@ spec:
           description: 'Specification of the desired behavior of the queue. More info:
             https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
           properties:
+            affinity:
+              description: If specified, the pod owned by the queue will be scheduled
+                with constraint
+              properties:
+                nodeGroupAffinity:
+                  description: Describes nodegroup affinity scheduling rules for the
+                    queue(e.g. putting pods of the queue in the nodes of the nodegroup)
+                  properties:
+                    preferredDuringSchedulingIgnoredDuringExecution:
+                      items:
+                        type: string
+                      type: array
+                    requiredDuringSchedulingIgnoredDuringExecution:
+                      items:
+                        type: string
+                      type: array
+                  type: object
+                nodeGroupAntiAffinity:
+                  description: Describes nodegroup anti-affinity scheduling rules
+                    for the queue(e.g. avoid putting pods of the queue in the nodes
+                    of the nodegroup).
+                  properties:
+                    preferredDuringSchedulingIgnoredDuringExecution:
+                      items:
+                        type: string
+                      type: array
+                    requiredDuringSchedulingIgnoredDuringExecution:
+                      items:
+                        type: string
+                      type: array
+                  type: object
+              type: object
             capability:
               additionalProperties:
                 anyOf:

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/agiledragon/gomonkey/v2 v2.1.0
-	github.com/fsnotify/fsnotify v1.4.9
+	github.com/fsnotify/fsnotify v1.5.1
 	github.com/golang/mock v1.6.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/go-multierror v1.0.0
@@ -29,9 +29,9 @@ require (
 	k8s.io/klog v1.0.0
 	k8s.io/kubernetes v1.23.0
 	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
-	sigs.k8s.io/yaml v1.2.0
+	sigs.k8s.io/yaml v1.3.0
 	stathat.com/c/consistent v1.0.0
-	volcano.sh/apis v1.5.0-beta.0.0.20220427084719-22d3dd007a8f
+	volcano.sh/apis v0.0.0-20220705062437-edd428c7d2fd
 )
 
 require (
@@ -104,7 +104,7 @@ require (
 	k8s.io/kube-scheduler v0.0.0 // indirect
 	k8s.io/mount-utils v0.23.0 // indirect
 	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 )
 
 replace (

diff --git a/go.sum b/go.sum
@@ -191,8 +191,9 @@ github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNy
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
+github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
@@ -472,8 +473,9 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -885,8 +887,10 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1192,11 +1196,13 @@ sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFc
 sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io=
 sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
-sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
 stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c=
 stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0=
-volcano.sh/apis v1.5.0-beta.0.0.20220427084719-22d3dd007a8f h1:+7iBzMkQlcUvLvgXxdDSyZHjFweUiGVale2Vcdx+Aas=
-volcano.sh/apis v1.5.0-beta.0.0.20220427084719-22d3dd007a8f/go.mod h1:5SH/3xDpBUk9iV/tm63rT4tBsETbYV6XIMmoYAbnGz8=
+volcano.sh/apis v0.0.0-20220705062437-edd428c7d2fd h1:b48P7vnI1FHyw2ZaAwtgH8D2vCNyxWJxFU15PqSFmn8=
+volcano.sh/apis v0.0.0-20220705062437-edd428c7d2fd/go.mod h1:drNMGuHPn1ew7oBSDQb5KRey6tXOQksbUtw3gPxF3Vo=
diff --git a/installer/helm/chart/volcano/crd/bases/batch.volcano.sh_jobs.yaml b/installer/helm/chart/volcano/crd/bases/batch.volcano.sh_jobs.yaml
@@ -30,6 +30,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: AGE
       type: date
+    - jsonPath: .spec.queue
+      name: QUEUE
+      priority: 1
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:

diff --git a/installer/helm/chart/volcano/crd/bases/scheduling.volcano.sh_podgroups.yaml b/installer/helm/chart/volcano/crd/bases/scheduling.volcano.sh_podgroups.yaml
@@ -17,7 +17,24 @@ spec:
     singular: podgroup
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: STATUS
+      type: string
+    - jsonPath: .spec.minMember
+      name: minMember
+      type: integer
+    - jsonPath: .status.running
+      name: RUNNINGS
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    - jsonPath: .spec.queue
+      name: QUEUE
+      priority: 1
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: PodGroup is a collection of Pod; used for batch workload.
@@ -130,6 +147,7 @@ spec:
         type: object
     served: true
     storage: true
+    subresources: {}
 status:
   acceptedNames:
     kind: ""

diff --git a/installer/helm/chart/volcano/crd/bases/scheduling.volcano.sh_queues.yaml b/installer/helm/chart/volcano/crd/bases/scheduling.volcano.sh_queues.yaml
@@ -38,6 +38,39 @@ spec:
             description: 'Specification of the desired behavior of the queue. More
               info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
             properties:
+              affinity:
+                description: If specified, the pod owned by the queue will be scheduled
+                  with constraint
+                properties:
+                  nodeGroupAffinity:
+                    description: Describes nodegroup affinity scheduling rules for
+                      the queue(e.g. putting pods of the queue in the nodes of the
+                      nodegroup)
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  nodeGroupAntiAffinity:
+                    description: Describes nodegroup anti-affinity scheduling rules
+                      for the queue(e.g. avoid putting pods of the queue in the nodes
+                      of the nodegroup).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               capability:
                 additionalProperties:
                   anyOf:

diff --git a/installer/helm/chart/volcano/crd/v1beta1/batch.volcano.sh_jobs.yaml b/installer/helm/chart/volcano/crd/v1beta1/batch.volcano.sh_jobs.yaml
@@ -19,6 +19,10 @@ spec:
   - JSONPath: .metadata.creationTimestamp
     name: AGE
     type: date
+  - JSONPath: .spec.queue
+    name: QUEUE
+    priority: 1
+    type: string
   group: batch.volcano.sh
   names:
     kind: Job

diff --git a/installer/helm/chart/volcano/crd/v1beta1/scheduling.volcano.sh_podgroups.yaml b/installer/helm/chart/volcano/crd/v1beta1/scheduling.volcano.sh_podgroups.yaml
@@ -6,6 +6,23 @@ metadata:
   creationTimestamp: null
   name: podgroups.scheduling.volcano.sh
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.phase
+    name: STATUS
+    type: string
+  - JSONPath: .spec.minMember
+    name: minMember
+    type: integer
+  - JSONPath: .status.running
+    name: RUNNINGS
+    type: integer
+  - JSONPath: .metadata.creationTimestamp
+    name: AGE
+    type: date
+  - JSONPath: .spec.queue
+    name: QUEUE
+    priority: 1
+    type: string
   group: scheduling.volcano.sh
   names:
     kind: PodGroup
@@ -16,6 +33,7 @@ spec:
     - podgroup-v1beta1
     singular: podgroup
   scope: Namespaced
+  subresources: {}
   validation:
     openAPIV3Schema:
       description: PodGroup is a collection of Pod; used for batch workload.