Fix admission test issue

kevin-wangzefeng · Mar 29, 2019 · dcfb24b · dcfb24b
1 parent 786e9d3
commit dcfb24b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -13,6 +13,7 @@ volcano.sh/volcano/pkg/controllers/job/cache
 volcano.sh/volcano/pkg/controllers/job/helpers
 volcano.sh/volcano/pkg/controllers/job/plugins
 volcano.sh/volcano/pkg/controllers/job/plugins/env
+volcano.sh/volcano/pkg/controllers/job/plugins/interface
 volcano.sh/volcano/pkg/controllers/job/plugins/ssh
 volcano.sh/volcano/pkg/controllers/job/state
 volcano.sh/volcano/pkg/scheduler/actions/allocate

diff --git a/installer/chart/volcano/templates/admission-config.yaml b/installer/chart/volcano/templates/admission-config.yaml
@@ -6,7 +6,6 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade,post-delete
 webhooks:
   - clientConfig:
-      caBundle: ""
       service:
         name: {{ .Release.Name }}-admission-service
         namespace: {{ .Release.Namespace }}
@@ -33,7 +32,6 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade,post-delete
 webhooks:
   - clientConfig:
-      caBundle: ""
       service:
         name: {{ .Release.Name }}-admission-service
         namespace: {{ .Release.Namespace }}

diff --git a/installer/chart/volcano/values.yaml b/installer/chart/volcano/values.yaml
@@ -4,4 +4,4 @@ basic:
   scheduler_image_name: "volcano-scheduler"
   admission_image_name: "volcano-admission"
   admission_secret_name: "volcano-admission-secret"
-  image_pull_secret: ""
+  image_pull_secret: ""
diff --git a/pkg/admission/admit_job.go b/pkg/admission/admit_job.go
@@ -106,10 +106,6 @@ func validateJobSpec(jobSpec v1alpha1.JobSpec, reviewResponse *v1beta1.Admission
 		msg = msg + fmt.Sprintf(" duplicated job event policies: %s;", duplicateInfo)
 	}
 
-	if msg != "" {
-		reviewResponse.Allowed = false
-	}
-
 	//invalid job plugins
 	if len(jobSpec.Plugins) != 0 {
 		for name := range jobSpec.Plugins {
@@ -119,6 +115,10 @@ func validateJobSpec(jobSpec v1alpha1.JobSpec, reviewResponse *v1beta1.Admission
 		}
 	}
 
+	if msg != "" {
+		reviewResponse.Allowed = false
+	}
+
 	return msg
 }