Skip to content

Commit b85b04d

Browse files
Merge pull request #143 from TommyLike/feature/update_crds
Update volcano crds & sample files
2 parents 7ecec77 + b43736b commit b85b04d

10 files changed

+53
-165
lines changed

example/integrations/tensorflow/tf-example.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ spec:
3737
minAvailable: 2
3838
schedulerName: kube-batch
3939
plugins:
40+
env: []
4041
svc: []
4142
policies:
4243
- event: PodEvicted

example/job.yaml

+31-25
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,36 @@ spec:
66
minAvailable: 3
77
schedulerName: kube-batch
88
policies:
9-
- event: PodEvicted
10-
action: RestartJob
9+
- event: PodEvicted
10+
action: RestartJob
11+
plugins:
12+
ssh: []
13+
env: []
14+
svc: []
15+
maxRetry: 5
16+
queue: default
1117
volumes:
12-
- mountPath: "/myinput"
13-
- mountPath: "/myoutput"
14-
volumeClaimName: "testvolumeclaimname"
15-
volumeClaim:
16-
accessModes: [ "ReadWriteOnce" ]
17-
storageClassName: "my-storage-class"
18-
resources:
19-
requests:
20-
storage: 1Gi
18+
- mountPath: "/myinput"
19+
- mountPath: "/myoutput"
20+
volumeClaimName: "testvolumeclaimname"
21+
volumeClaim:
22+
accessModes: [ "ReadWriteOnce" ]
23+
storageClassName: "my-storage-class"
24+
resources:
25+
requests:
26+
storage: 1Gi
2127
tasks:
22-
- replicas: 6
23-
name: "default-nginx"
24-
template:
25-
metadata:
26-
name: web
27-
spec:
28-
containers:
29-
- image: nginx
30-
imagePullPolicy: IfNotPresent
31-
name: nginx
32-
resources:
33-
requests:
34-
cpu: "1"
35-
restartPolicy: OnFailure
28+
- replicas: 6
29+
name: "default-nginx"
30+
template:
31+
metadata:
32+
name: web
33+
spec:
34+
containers:
35+
- image: nginx
36+
imagePullPolicy: IfNotPresent
37+
name: nginx
38+
resources:
39+
requests:
40+
cpu: "1"
41+
restartPolicy: OnFailure

example/kube-batch-conf.yaml

-11
This file was deleted.

example/openmpi-hello.yaml

-56
This file was deleted.

example/role.yaml

-12
This file was deleted.

example/tensorflow-benchmark.yaml

-61
This file was deleted.

installer/chart/volcano/templates/batch_v1alpha1_job.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ spec:
7474
schedulerName:
7575
description: SchedulerName is the default value of `tasks.template.spec.schedulerName`.
7676
type: string
77+
plugins:
78+
description: Enabled task plugins when creating job.
79+
type: object
80+
additionalProperties:
81+
type: array
7782
tasks:
7883
description: Tasks specifies the task specification of Job
7984
items:
@@ -111,6 +116,13 @@ spec:
111116
type: object
112117
type: object
113118
type: array
119+
queue:
120+
description: The name of the queue on which job should been created
121+
type: string
122+
maxRetry:
123+
description: The limit for retrying submiting job, default is 3
124+
format: int32
125+
type: integer
114126
type: object
115127
status:
116128
description: Current status of Job
@@ -139,6 +151,15 @@ spec:
139151
description: Job's current version
140152
format: int32
141153
type: integer
154+
retryCount:
155+
description: The number that volcano retried to submit the job.
156+
format: int32
157+
type: integer
158+
ControlledResources:
159+
description: All of the resources that are controlled by this job.
160+
type: object
161+
additionalProperties:
162+
type: string
142163
state:
143164
description: Current state of Job.
144165
properties:

0 commit comments

Comments
 (0)