Update yamls.

Signed-off-by: jiangkaihua <jiangkaihua1@huawei.com>
volcano-sh · Dec 6, 2022 · 3dc607c · 3dc607c
1 parent f32b7e9
commit 3dc607c
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 1 deletion.
diff --git a/config/crd/bases/scheduling.volcano.sh_queues.yaml b/config/crd/bases/scheduling.volcano.sh_queues.yaml
@@ -133,6 +133,15 @@ spec:
           status:
             description: The status of queue.
             properties:
+              allocated:
+                additionalProperties:
+                  anyOf:
+                  - type: integer
+                  - type: string
+                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                  x-kubernetes-int-or-string: true
+                description: Allocated is allocated resources in queue
+                type: object
               completed:
                 description: The number of `Completed` PodGroup in this queue.
                 format: int32
@@ -176,6 +185,8 @@ spec:
                 description: The number of 'Unknown' PodGroup in this queue.
                 format: int32
                 type: integer
+            required:
+            - allocated
             type: object
         type: object
     served: true

diff --git a/config/crd/v1beta1/scheduling.volcano.sh_queues.yaml b/config/crd/v1beta1/scheduling.volcano.sh_queues.yaml
@@ -132,6 +132,15 @@ spec:
         status:
           description: The status of queue.
           properties:
+            allocated:
+              additionalProperties:
+                anyOf:
+                - type: integer
+                - type: string
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
+              description: Allocated is allocated resources in queue
+              type: object
             completed:
               description: The number of `Completed` PodGroup in this queue.
               format: int32
@@ -175,6 +184,8 @@ spec:
               description: The number of 'Unknown' PodGroup in this queue.
               format: int32
               type: integer
+          required:
+          - allocated
           type: object
       type: object
   version: v1beta1

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
@@ -131,6 +131,15 @@ spec:
           status:
             description: The status of queue.
             properties:
+              allocated:
+                additionalProperties:
+                  anyOf:
+                  - type: integer
+                  - type: string
+                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                  x-kubernetes-int-or-string: true
+                description: Allocated is allocated resources in queue
+                type: object
               completed:
                 description: The number of `Completed` PodGroup in this queue.
                 format: int32
@@ -174,6 +183,8 @@ spec:
                 description: The number of 'Unknown' PodGroup in this queue.
                 format: int32
                 type: integer
+            required:
+            - allocated
             type: object
         type: object
     served: true

diff --git a/installer/helm/chart/volcano/crd/v1beta1/scheduling.volcano.sh_queues.yaml b/installer/helm/chart/volcano/crd/v1beta1/scheduling.volcano.sh_queues.yaml
@@ -130,6 +130,15 @@ spec:
         status:
           description: The status of queue.
           properties:
+            allocated:
+              additionalProperties:
+                anyOf:
+                - type: integer
+                - type: string
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
+              description: Allocated is allocated resources in queue
+              type: object
             completed:
               description: The number of `Completed` PodGroup in this queue.
               format: int32
@@ -173,6 +182,8 @@ spec:
               description: The number of 'Unknown' PodGroup in this queue.
               format: int32
               type: integer
+          required:
+          - allocated
           type: object
       type: object
   version: v1beta1

diff --git a/installer/helm/chart/volcano/templates/scheduler.yaml b/installer/helm/chart/volcano/templates/scheduler.yaml
@@ -63,6 +63,9 @@ rules:
   - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
     resources: ["queues"]
     verbs: ["get", "list", "watch", "create", "delete"]
+  - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
+    resources: ["queues/status"]
+    verbs: ["update"]
   - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
     resources: ["podgroups"]
     verbs: ["list", "watch", "update"]
@@ -150,4 +153,4 @@ spec:
   selector:
     app: volcano-scheduler
   type: ClusterIP
-{{- end }}
+{{- end }}
diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
@@ -8690,6 +8690,9 @@ rules:
   - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
     resources: ["queues"]
     verbs: ["get", "list", "watch", "create", "delete"]
+  - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
+    resources: ["queues/status"]
+    verbs: ["update"]
   - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
     resources: ["podgroups"]
     verbs: ["list", "watch", "update"]
@@ -9067,6 +9070,15 @@ spec:
           status:
             description: The status of queue.
             properties:
+              allocated:
+                additionalProperties:
+                  anyOf:
+                  - type: integer
+                  - type: string
+                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                  x-kubernetes-int-or-string: true
+                description: Allocated is allocated resources in queue
+                type: object
               completed:
                 description: The number of `Completed` PodGroup in this queue.
                 format: int32
@@ -9110,6 +9122,8 @@ spec:
                 description: The number of 'Unknown' PodGroup in this queue.
                 format: int32
                 type: integer
+            required:
+            - allocated
             type: object
         type: object
     served: true