Skip to content

Commit 78bd4a1

Browse files
committed
Merge branch 'feature/support-admission-test' of https://github.com/volcano-sh/volcano into feature/support-admission-test
2 parents da85b44 + a602666 commit 78bd4a1

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
BIN_DIR=_output/bin
2-
export IMAGE=volcano
3-
export TAG = 1.0
2+
IMAGE=volcano
3+
TAG = 1.0
4+
5+
.EXPORT_ALL_VARIABLES:
46

57
all: controllers scheduler cli admission
68

test/e2e/util.go

-5
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ type jobSpec struct {
295295
tasks []taskSpec
296296
policies []vkv1.LifecyclePolicy
297297
min int32
298-
version int32
299298
}
300299

301300
func getNS(context *context, job *jobSpec) string {
@@ -376,10 +375,6 @@ func createJobInner(context *context, jobSpec *jobSpec) (*vkv1.Job, error) {
376375
min += task.min
377376
}
378377

379-
if jobSpec.version > 0 {
380-
job.Status.Version = jobSpec.version
381-
}
382-
383378
if jobSpec.min > 0 {
384379
job.Spec.MinAvailable = jobSpec.min
385380
} else {

0 commit comments

Comments
 (0)