From 399b6b50f082d22ea2d05a9a7d3a92683098dd0e Mon Sep 17 00:00:00 2001 From: cici37 Date: Mon, 4 May 2020 09:52:47 -0700 Subject: [PATCH 1/2] Remove //pkg/api/legacyscheme from CCM --- cmd/cloud-controller-manager/app/options/BUILD | 2 +- cmd/cloud-controller-manager/app/options/options.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/cloud-controller-manager/app/options/BUILD b/cmd/cloud-controller-manager/app/options/BUILD index 0728040189f..908abe2bac4 100644 --- a/cmd/cloud-controller-manager/app/options/BUILD +++ b/cmd/cloud-controller-manager/app/options/BUILD @@ -16,7 +16,6 @@ go_library( "//cmd/cloud-controller-manager/app/apis/config/v1alpha1:go_default_library", "//cmd/cloud-controller-manager/app/config:go_default_library", "//cmd/controller-manager/app/options:go_default_library", - "//pkg/api/legacyscheme:go_default_library", "//pkg/controller:go_default_library", "//pkg/features:go_default_library", "//pkg/master/ports:go_default_library", @@ -27,6 +26,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", diff --git a/cmd/cloud-controller-manager/app/options/options.go b/cmd/cloud-controller-manager/app/options/options.go index 197ad31d0dd..73ffee1f17e 100644 --- a/cmd/cloud-controller-manager/app/options/options.go +++ b/cmd/cloud-controller-manager/app/options/options.go @@ -29,6 +29,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -40,7 +41,6 @@ import ( ccmconfigv1alpha1 "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1" cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config" cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options" - "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/master/ports" @@ -269,6 +269,5 @@ func createRecorder(kubeClient clientset.Interface, userAgent string) record.Eve eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(klog.Infof) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")}) - // TODO: remove dependence on the legacyscheme - return eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: userAgent}) + return eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: userAgent}) } From 50ea7a0435f9fd6fa943b1e353b95b23c33a58fb Mon Sep 17 00:00:00 2001 From: cici37 Date: Thu, 7 May 2020 16:43:19 -0700 Subject: [PATCH 2/2] Remove pkg/api/legacyscheme from cmd/controller-manager --- cmd/controller-manager/app/BUILD | 2 +- cmd/controller-manager/app/serve.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/controller-manager/app/BUILD b/cmd/controller-manager/app/BUILD index a061d656143..aa16c87a888 100644 --- a/cmd/controller-manager/app/BUILD +++ b/cmd/controller-manager/app/BUILD @@ -9,7 +9,6 @@ go_library( importpath = "k8s.io/kubernetes/cmd/controller-manager/app", visibility = ["//visibility:public"], deps = [ - "//pkg/api/legacyscheme:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/filters:go_default_library", @@ -20,6 +19,7 @@ go_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:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/component-base/config:go_default_library", "//staging/src/k8s.io/component-base/configz:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", diff --git a/cmd/controller-manager/app/serve.go b/cmd/controller-manager/app/serve.go index a241c6ddf4e..da49af3afdd 100644 --- a/cmd/controller-manager/app/serve.go +++ b/cmd/controller-manager/app/serve.go @@ -27,21 +27,21 @@ 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" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/configz" "k8s.io/component-base/metrics/legacyregistry" _ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration - "k8s.io/kubernetes/pkg/api/legacyscheme" ) // BuildHandlerChain builds a handler chain with a base handler and CompletedConfig. func BuildHandlerChain(apiHandler http.Handler, authorizationInfo *apiserver.AuthorizationInfo, authenticationInfo *apiserver.AuthenticationInfo) http.Handler { requestInfoResolver := &apirequest.RequestInfoFactory{} - failedHandler := genericapifilters.Unauthorized(legacyscheme.Codecs) + failedHandler := genericapifilters.Unauthorized(scheme.Codecs) handler := apiHandler if authorizationInfo != nil { - handler = genericapifilters.WithAuthorization(apiHandler, authorizationInfo.Authorizer, legacyscheme.Codecs) + handler = genericapifilters.WithAuthorization(apiHandler, authorizationInfo.Authorizer, scheme.Codecs) } if authenticationInfo != nil { handler = genericapifilters.WithAuthentication(handler, authenticationInfo.Authenticator, failedHandler, nil)