Skip to content

Commit

Permalink
Merge branch 'feature/support-admission-test' of https://github.com/v…
Browse files Browse the repository at this point in the history
…olcano-sh/volcano into feature/support-admission-test
  • Loading branch information
TommyLike committed Mar 25, 2019
2 parents da85b44 + a602666 commit 78bd4a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
BIN_DIR=_output/bin
export IMAGE=volcano
export TAG = 1.0
IMAGE=volcano
TAG = 1.0

.EXPORT_ALL_VARIABLES:

all: controllers scheduler cli admission

Expand Down
5 changes: 0 additions & 5 deletions test/e2e/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ type jobSpec struct {
tasks []taskSpec
policies []vkv1.LifecyclePolicy
min int32
version int32
}

func getNS(context *context, job *jobSpec) string {
Expand Down Expand Up @@ -376,10 +375,6 @@ func createJobInner(context *context, jobSpec *jobSpec) (*vkv1.Job, error) {
min += task.min
}

if jobSpec.version > 0 {
job.Status.Version = jobSpec.version
}

if jobSpec.min > 0 {
job.Spec.MinAvailable = jobSpec.min
} else {
Expand Down

0 comments on commit 78bd4a1

Please sign in to comment.