Merge pull request volcano-sh#143 from TommyLike/feature/update_crds

Update volcano crds & sample files
kevin-wangzefeng · May 8, 2019 · ad4b733 · ad4b733
2 parents ed1bdc1 + d70493d
commit ad4b733
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 165 deletions.
diff --git a/example/integrations/tensorflow/tf-example.yaml b/example/integrations/tensorflow/tf-example.yaml
@@ -37,6 +37,7 @@ spec:
   minAvailable: 2
   schedulerName: kube-batch
   plugins:
+    env: []
     svc: []
   policies:
     - event: PodEvicted

diff --git a/...e/duplicatedPolicyEvent-webhook-deny.yaml → ...s/duplicatedPolicyEvent-webhook-deny.yaml b/...e/duplicatedPolicyEvent-webhook-deny.yaml → ...s/duplicatedPolicyEvent-webhook-deny.yaml
diff --git a/example/duplicatedTaskName-webhook-deny.yaml → ...jobs/duplicatedTaskName-webhook-deny.yaml b/example/duplicatedTaskName-webhook-deny.yaml → ...jobs/duplicatedTaskName-webhook-deny.yaml
diff --git a/example/minAvailable-webhook-deny.yaml → ...valid_jobs/minAvailable-webhook-deny.yaml b/example/minAvailable-webhook-deny.yaml → ...valid_jobs/minAvailable-webhook-deny.yaml
diff --git a/example/job.yaml b/example/job.yaml
@@ -6,30 +6,36 @@ spec:
   minAvailable: 3
   schedulerName: kube-batch
   policies:
-  - event: PodEvicted
-    action: RestartJob
+    - event: PodEvicted
+      action: RestartJob
+  plugins:
+    ssh: []
+    env: []
+    svc: []
+  maxRetry: 5
+  queue: default
   volumes:
-  - mountPath: "/myinput"
-  - mountPath: "/myoutput"
-    volumeClaimName: "testvolumeclaimname"
-    volumeClaim:
-      accessModes: [ "ReadWriteOnce" ]
-      storageClassName: "my-storage-class"
-      resources:
-        requests:
-          storage: 1Gi
+    - mountPath: "/myinput"
+    - mountPath: "/myoutput"
+      volumeClaimName: "testvolumeclaimname"
+      volumeClaim:
+        accessModes: [ "ReadWriteOnce" ]
+        storageClassName: "my-storage-class"
+        resources:
+          requests:
+            storage: 1Gi
   tasks:
-  - replicas: 6
-    name: "default-nginx"
-    template:
-      metadata:
-        name: web
-      spec:
-        containers:
-        - image: nginx
-          imagePullPolicy: IfNotPresent
-          name: nginx
-          resources:
-            requests:
-              cpu: "1"
-        restartPolicy: OnFailure
+    - replicas: 6
+      name: "default-nginx"
+      template:
+        metadata:
+          name: web
+        spec:
+          containers:
+            - image: nginx
+              imagePullPolicy: IfNotPresent
+              name: nginx
+              resources:
+                requests:
+                  cpu: "1"
+          restartPolicy: OnFailure
diff --git a/example/kube-batch-conf.yaml b/example/kube-batch-conf.yaml
diff --git a/example/openmpi-hello.yaml b/example/openmpi-hello.yaml
diff --git a/example/role.yaml b/example/role.yaml
diff --git a/example/tensorflow-benchmark.yaml b/example/tensorflow-benchmark.yaml
diff --git a/installer/chart/volcano/templates/batch_v1alpha1_job.yaml b/installer/chart/volcano/templates/batch_v1alpha1_job.yaml
@@ -74,6 +74,11 @@ spec:
             schedulerName:
               description: SchedulerName is the default value of `tasks.template.spec.schedulerName`.
               type: string
+            plugins:
+              description: Enabled task plugins when creating job.
+              type: object
+              additionalProperties:
+                type: array
             tasks:
               description: Tasks specifies the task specification of Job
               items:
@@ -111,6 +116,13 @@ spec:
                     type: object
                 type: object
               type: array
+            queue:
+              description: The name of the queue on which job should been created
+              type: string
+            maxRetry:
+              description: The limit for retrying submiting job, default is 3
+              format: int32
+              type: integer
           type: object
         status:
           description: Current status of Job
@@ -139,6 +151,15 @@ spec:
               description: Job's current version
               format: int32
               type: integer
+            retryCount:
+              description: The number that volcano retried to submit the job.
+              format: int32
+              type: integer
+            ControlledResources:
+              description: All of the resources that are controlled by this job.
+              type: object
+              additionalProperties:
+                type: string
             state:
               description: Current state of Job.
               properties: