Merge pull request #644 from k82cn/webhook_refactor

Refactor webhook org.
volcano-sh · Dec 26, 2019 · 3d74da7 · 3d74da7
2 parents a1698f9 + e34e62f
commit 3d74da7
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/cmd/webhook-manager/app/server.go b/cmd/webhook-manager/app/server.go
@@ -29,8 +29,8 @@ import (
 	"k8s.io/klog"
 
 	"volcano.sh/volcano/cmd/webhook-manager/app/options"
-	"volcano.sh/volcano/pkg/admission/router"
 	"volcano.sh/volcano/pkg/version"
+	"volcano.sh/volcano/pkg/webhooks/router"
 )
 
 // Run start the service of admission controller.

diff --git a/cmd/webhook-manager/app/util.go b/cmd/webhook-manager/app/util.go
@@ -29,8 +29,8 @@ import (
 	"k8s.io/klog"
 
 	"volcano.sh/volcano/cmd/webhook-manager/app/options"
-	"volcano.sh/volcano/pkg/admission/router"
 	"volcano.sh/volcano/pkg/client/clientset/versioned"
+	"volcano.sh/volcano/pkg/webhooks/router"
 )
 
 func registerWebhookConfig(kubeClient *kubernetes.Clientset, config *options.Config, service *router.AdmissionService, caBundle []byte) {

diff --git a/cmd/webhook-manager/main.go b/cmd/webhook-manager/main.go
@@ -30,9 +30,9 @@ import (
 	"volcano.sh/volcano/cmd/webhook-manager/app"
 	"volcano.sh/volcano/cmd/webhook-manager/app/options"
 
-	_ "volcano.sh/volcano/pkg/admission/jobs/mutate"
-	_ "volcano.sh/volcano/pkg/admission/jobs/validate"
-	_ "volcano.sh/volcano/pkg/admission/pods"
+	_ "volcano.sh/volcano/pkg/webhooks/admission/jobs/mutate"
+	_ "volcano.sh/volcano/pkg/webhooks/admission/jobs/validate"
+	_ "volcano.sh/volcano/pkg/webhooks/admission/pods"
 )
 
 var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes")

diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -1,6 +1,3 @@
-volcano.sh/volcano/pkg/admission/jobs/mutate
-volcano.sh/volcano/pkg/admission/router
-volcano.sh/volcano/pkg/admission/schema
 volcano.sh/volcano/pkg/apis/scheduling
 volcano.sh/volcano/pkg/apis/scheduling/v1alpha1
 volcano.sh/volcano/pkg/apis/scheduling/v1alpha2
@@ -10,4 +7,7 @@ volcano.sh/volcano/pkg/scheduler/actions/backfill
 volcano.sh/volcano/pkg/scheduler/actions/enqueue
 volcano.sh/volcano/pkg/scheduler/actions/preempt
 volcano.sh/volcano/pkg/scheduler/actions/reclaim
+volcano.sh/volcano/pkg/webhooks/admission/jobs/mutate
+volcano.sh/volcano/pkg/webhooks/router
+volcano.sh/volcano/pkg/webhooks/schema
 volcano.sh/volcano/test/e2e
diff --git a/pkg/admission/jobs/mutate/mutate_job.go → ...hooks/admission/jobs/mutate/mutate_job.go b/pkg/admission/jobs/mutate/mutate_job.go → ...hooks/admission/jobs/mutate/mutate_job.go
@@ -26,10 +26,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/pkg/admission/router"
-	"volcano.sh/volcano/pkg/admission/schema"
-	"volcano.sh/volcano/pkg/admission/util"
 	"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
+	"volcano.sh/volcano/pkg/webhooks/router"
+	"volcano.sh/volcano/pkg/webhooks/schema"
+	"volcano.sh/volcano/pkg/webhooks/util"
 )
 
 const (

diff --git a/pkg/admission/jobs/mutate/mutate_job_test.go → .../admission/jobs/mutate/mutate_job_test.go b/pkg/admission/jobs/mutate/mutate_job_test.go → .../admission/jobs/mutate/mutate_job_test.go
diff --git a/pkg/admission/jobs/validate/admit_job.go → ...ooks/admission/jobs/validate/admit_job.go b/pkg/admission/jobs/validate/admit_job.go → ...ooks/admission/jobs/validate/admit_job.go
@@ -31,11 +31,11 @@ import (
 	k8scorev1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	k8scorevalid "k8s.io/kubernetes/pkg/apis/core/validation"
 
-	"volcano.sh/volcano/pkg/admission/router"
-	"volcano.sh/volcano/pkg/admission/schema"
-	"volcano.sh/volcano/pkg/admission/util"
 	"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
 	"volcano.sh/volcano/pkg/controllers/job/plugins"
+	"volcano.sh/volcano/pkg/webhooks/router"
+	"volcano.sh/volcano/pkg/webhooks/schema"
+	"volcano.sh/volcano/pkg/webhooks/util"
 )
 
 func init() {

diff --git a/...admission/jobs/validate/admit_job_test.go → ...admission/jobs/validate/admit_job_test.go b/...admission/jobs/validate/admit_job_test.go → ...admission/jobs/validate/admit_job_test.go
diff --git a/pkg/admission/jobs/validate/util.go → pkg/webhooks/admission/jobs/validate/util.go b/pkg/admission/jobs/validate/util.go → pkg/webhooks/admission/jobs/validate/util.go
diff --git a/pkg/admission/pods/admit_pod.go → pkg/webhooks/admission/pods/admit_pod.go b/pkg/admission/pods/admit_pod.go → pkg/webhooks/admission/pods/admit_pod.go
@@ -27,12 +27,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/pkg/admission/router"
-	"volcano.sh/volcano/pkg/admission/schema"
-	"volcano.sh/volcano/pkg/admission/util"
 	"volcano.sh/volcano/pkg/apis/helpers"
 	"volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
 	"volcano.sh/volcano/pkg/apis/scheduling/v1alpha2"
+	"volcano.sh/volcano/pkg/webhooks/router"
+	"volcano.sh/volcano/pkg/webhooks/schema"
+	"volcano.sh/volcano/pkg/webhooks/util"
 )
 
 func init() {

diff --git a/pkg/admission/pods/admit_pod_test.go → ...webhooks/admission/pods/admit_pod_test.go b/pkg/admission/pods/admit_pod_test.go → ...webhooks/admission/pods/admit_pod_test.go
diff --git a/pkg/admission/router/factory.go → pkg/webhooks/router/factory.go b/pkg/admission/router/factory.go → pkg/webhooks/router/factory.go
diff --git a/pkg/admission/router/interface.go → pkg/webhooks/router/interface.go b/pkg/admission/router/interface.go → pkg/webhooks/router/interface.go
diff --git a/pkg/admission/router/server.go → pkg/webhooks/router/server.go b/pkg/admission/router/server.go → pkg/webhooks/router/server.go
@@ -25,8 +25,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog"
 
-	"volcano.sh/volcano/pkg/admission/schema"
-	"volcano.sh/volcano/pkg/admission/util"
+	"volcano.sh/volcano/pkg/webhooks/schema"
+	"volcano.sh/volcano/pkg/webhooks/util"
 )
 
 // CONTENTTYPE http content-type

diff --git a/pkg/admission/schema/schema.go → pkg/webhooks/schema/schema.go b/pkg/admission/schema/schema.go → pkg/webhooks/schema/schema.go
diff --git a/pkg/admission/util/util.go → pkg/webhooks/util/util.go b/pkg/admission/util/util.go → pkg/webhooks/util/util.go