From 3a237dd367e29dcb92796dc3df1c7fdc85adaa95 Mon Sep 17 00:00:00 2001 From: zhouya0 Date: Sun, 16 Aug 2020 18:49:15 +0800 Subject: [PATCH] Scheduler auth stop using legacy scheme --- cmd/kube-scheduler/app/BUILD | 2 +- cmd/kube-scheduler/app/server.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD index 8a091fc21cb..51248c2da03 100644 --- a/cmd/kube-scheduler/app/BUILD +++ b/cmd/kube-scheduler/app/BUILD @@ -13,7 +13,6 @@ go_library( deps = [ "//cmd/kube-scheduler/app/config:go_default_library", "//cmd/kube-scheduler/app/options:go_default_library", - "//pkg/api/legacyscheme:go_default_library", "//pkg/scheduler:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/framework/runtime:go_default_library", @@ -28,6 +27,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/server/healthz:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/mux:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/routes:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/tools/events:go_default_library", "//staging/src/k8s.io/client-go/tools/leaderelection:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index b7c22674874..2d628ef373d 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -36,6 +36,7 @@ import ( "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" "k8s.io/apiserver/pkg/server/routes" + "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/events" "k8s.io/client-go/tools/leaderelection" cliflag "k8s.io/component-base/cli/flag" @@ -49,7 +50,6 @@ import ( "k8s.io/klog/v2" schedulerserverconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config" "k8s.io/kubernetes/cmd/kube-scheduler/app/options" - "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/scheduler" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" @@ -217,9 +217,9 @@ func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched * // buildHandlerChain wraps the given handler with the standard filters. func buildHandlerChain(handler http.Handler, authn authenticator.Request, authz authorizer.Authorizer) http.Handler { requestInfoResolver := &apirequest.RequestInfoFactory{} - failedHandler := genericapifilters.Unauthorized(legacyscheme.Codecs) + failedHandler := genericapifilters.Unauthorized(scheme.Codecs) - handler = genericapifilters.WithAuthorization(handler, authz, legacyscheme.Codecs) + handler = genericapifilters.WithAuthorization(handler, authz, scheme.Codecs) handler = genericapifilters.WithAuthentication(handler, authn, failedHandler, nil) handler = genericapifilters.WithRequestInfo(handler, requestInfoResolver) handler = genericapifilters.WithCacheControl(handler)