Skip to content

Commit e178653

Browse files
k82cnk82cn
committed
Refactor webhook org.
Signed-off-by: Klaus Ma <klaus1982.cn@gmail.com>
1 parent 21d9188 commit e178653

File tree

15 files changed

+16
-16
lines changed

15 files changed

+16
-16
lines changed

‎cmd/webhook-manager/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/klog"
3030

3131
"volcano.sh/volcano/cmd/webhook-manager/app/options"
32-
"volcano.sh/volcano/pkg/admission/router"
32+
"volcano.sh/volcano/pkg/webhooks/router"
3333
"volcano.sh/volcano/pkg/version"
3434
)
3535

‎cmd/webhook-manager/app/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/klog"
3030

3131
"volcano.sh/volcano/cmd/webhook-manager/app/options"
32-
"volcano.sh/volcano/pkg/admission/router"
32+
"volcano.sh/volcano/pkg/webhooks/router"
3333
"volcano.sh/volcano/pkg/client/clientset/versioned"
3434
)
3535

‎cmd/webhook-manager/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
"volcano.sh/volcano/cmd/webhook-manager/app"
3131
"volcano.sh/volcano/cmd/webhook-manager/app/options"
3232

33-
_ "volcano.sh/volcano/pkg/admission/jobs/mutate"
34-
_ "volcano.sh/volcano/pkg/admission/jobs/validate"
35-
_ "volcano.sh/volcano/pkg/admission/pods"
33+
_ "volcano.sh/volcano/pkg/webhooks/admission/jobs/mutate"
34+
_ "volcano.sh/volcano/pkg/webhooks/admission/jobs/validate"
35+
_ "volcano.sh/volcano/pkg/webhooks/admission/pods"
3636
)
3737

3838
var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes")

‎pkg/admission/jobs/mutate/mutate_job.go ‎pkg/webhooks/admission/jobs/mutate/mutate_job.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/klog"
2828

29-
"volcano.sh/volcano/pkg/admission/router"
30-
"volcano.sh/volcano/pkg/admission/schema"
31-
"volcano.sh/volcano/pkg/admission/util"
29+
"volcano.sh/volcano/pkg/webhooks/router"
30+
"volcano.sh/volcano/pkg/webhooks/schema"
31+
"volcano.sh/volcano/pkg/webhooks/util"
3232
"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
3333
)
3434

‎pkg/admission/jobs/mutate/mutate_job_test.go ‎pkg/webhooks/admission/jobs/mutate/mutate_job_test.go

File renamed without changes.

‎pkg/admission/jobs/validate/admit_job.go ‎pkg/webhooks/admission/jobs/validate/admit_job.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
k8scorev1 "k8s.io/kubernetes/pkg/apis/core/v1"
3232
k8scorevalid "k8s.io/kubernetes/pkg/apis/core/validation"
3333

34-
"volcano.sh/volcano/pkg/admission/router"
35-
"volcano.sh/volcano/pkg/admission/schema"
36-
"volcano.sh/volcano/pkg/admission/util"
3734
"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
3835
"volcano.sh/volcano/pkg/controllers/job/plugins"
36+
"volcano.sh/volcano/pkg/webhooks/router"
37+
"volcano.sh/volcano/pkg/webhooks/schema"
38+
"volcano.sh/volcano/pkg/webhooks/util"
3939
)
4040

4141
func init() {

‎pkg/admission/jobs/validate/admit_job_test.go ‎pkg/webhooks/admission/jobs/validate/admit_job_test.go

File renamed without changes.

‎pkg/admission/jobs/validate/util.go ‎pkg/webhooks/admission/jobs/validate/util.go

File renamed without changes.

‎pkg/admission/pods/admit_pod.go ‎pkg/webhooks/admission/pods/admit_pod.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/klog"
2929

30-
"volcano.sh/volcano/pkg/admission/router"
31-
"volcano.sh/volcano/pkg/admission/schema"
32-
"volcano.sh/volcano/pkg/admission/util"
30+
"volcano.sh/volcano/pkg/webhooks/router"
31+
"volcano.sh/volcano/pkg/webhooks/schema"
32+
"volcano.sh/volcano/pkg/webhooks/util"
3333
"volcano.sh/volcano/pkg/apis/helpers"
3434
"volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
3535
"volcano.sh/volcano/pkg/apis/scheduling/v1alpha2"

‎pkg/admission/pods/admit_pod_test.go ‎pkg/webhooks/admission/pods/admit_pod_test.go

File renamed without changes.

‎pkg/admission/router/factory.go ‎pkg/webhooks/router/factory.go

File renamed without changes.

‎pkg/admission/router/interface.go ‎pkg/webhooks/router/interface.go

File renamed without changes.

‎pkg/admission/router/server.go ‎pkg/webhooks/router/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/klog"
2727

28-
"volcano.sh/volcano/pkg/admission/schema"
29-
"volcano.sh/volcano/pkg/admission/util"
28+
"volcano.sh/volcano/pkg/webhooks/schema"
29+
"volcano.sh/volcano/pkg/webhooks/util"
3030
)
3131

3232
// CONTENTTYPE http content-type

‎pkg/admission/schema/schema.go ‎pkg/webhooks/schema/schema.go

File renamed without changes.

‎pkg/admission/util/util.go ‎pkg/webhooks/util/util.go

File renamed without changes.

0 commit comments

Comments
 (0)