Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor webhook org. #644

Merged
merged 1 commit into from
Dec 26, 2019
Merged

Refactor webhook org. #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/webhook-manager/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cmd/webhook-manager/app/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/webhook-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions hack/.golint_failures
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions pkg/admission/jobs/mutate/mutate_job.go → ...hooks/admission/jobs/mutate/mutate_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 pkg/admission/jobs/mutate/mutate_job_test.go → .../admission/jobs/mutate/mutate_job_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/admission/jobs/validate/admit_job.go → ...ooks/admission/jobs/validate/admit_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
0 ...admission/jobs/validate/admit_job_test.go → ...admission/jobs/validate/admit_job_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/admission/jobs/validate/util.go → pkg/webhooks/admission/jobs/validate/util.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/admission/pods/admit_pod.go → pkg/webhooks/admission/pods/admit_pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
0 pkg/admission/pods/admit_pod_test.go → ...webhooks/admission/pods/admit_pod_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/admission/router/factory.go → pkg/webhooks/router/factory.go
View file
Open in desktop
File renamed without changes.
0 pkg/admission/router/interface.go → pkg/webhooks/router/interface.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/admission/router/server.go → pkg/webhooks/router/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 pkg/admission/schema/schema.go → pkg/webhooks/schema/schema.go
View file
Open in desktop
File renamed without changes.
0 pkg/admission/util/util.go → pkg/webhooks/util/util.go
View file
Open in desktop
File renamed without changes.