From 76ce7bcbd830098fd3820e6675ee9ae4c6e57d7e Mon Sep 17 00:00:00 2001 From: deads2k Date: Wed, 25 Jan 2017 14:39:55 -0500 Subject: [PATCH] stop hardcoding api registry and codecs in webhook --- plugin/pkg/admission/imagepolicy/BUILD | 3 +- plugin/pkg/admission/imagepolicy/admission.go | 5 +- .../apiserver/pkg/util/webhook/webhook.go | 11 +- .../authenticator/token/webhook/webhook.go | 3 +- .../plugin/pkg/authorizer/webhook/webhook.go | 8 +- vendor/BUILD | 321 +----------------- 6 files changed, 17 insertions(+), 334 deletions(-) diff --git a/plugin/pkg/admission/imagepolicy/BUILD b/plugin/pkg/admission/imagepolicy/BUILD index c30cbfa9560..cc5b76c9302 100644 --- a/plugin/pkg/admission/imagepolicy/BUILD +++ b/plugin/pkg/admission/imagepolicy/BUILD @@ -19,6 +19,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/imagepolicy/install:go_default_library", + "//pkg/apis/imagepolicy/v1alpha1:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -26,8 +27,6 @@ go_library( "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/util/cache", "//vendor:k8s.io/apiserver/pkg/util/webhook", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/install", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/plugin/pkg/admission/imagepolicy/admission.go b/plugin/pkg/admission/imagepolicy/admission.go index 3c3c06f9c3f..defebc6e3d3 100644 --- a/plugin/pkg/admission/imagepolicy/admission.go +++ b/plugin/pkg/admission/imagepolicy/admission.go @@ -35,13 +35,12 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/util/cache" "k8s.io/apiserver/pkg/util/webhook" - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1" "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" // install the clientgo image policy API for use with api registry - _ "k8s.io/client-go/pkg/apis/imagepolicy/install" _ "k8s.io/kubernetes/pkg/apis/imagepolicy/install" ) @@ -228,7 +227,7 @@ func NewImagePolicyWebhook(configFile io.Reader) (admission.Interface, error) { return nil, err } - gw, err := webhook.NewGenericWebhook(whConfig.KubeConfigFile, groupVersions, whConfig.RetryBackoff) + gw, err := webhook.NewGenericWebhook(api.Registry, api.Codecs, whConfig.KubeConfigFile, groupVersions, whConfig.RetryBackoff) if err != nil { return nil, err } diff --git a/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go index 989dcda4aca..4f03b50e74b 100755 --- a/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go @@ -22,15 +22,14 @@ import ( "time" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/runtime/serializer" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/api" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - - _ "k8s.io/client-go/pkg/apis/authorization/install" ) type GenericWebhook struct { @@ -39,9 +38,9 @@ type GenericWebhook struct { } // NewGenericWebhook creates a new GenericWebhook from the provided kubeconfig file. -func NewGenericWebhook(kubeConfigFile string, groupVersions []schema.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) { +func NewGenericWebhook(registry *registered.APIRegistrationManager, codecFactory serializer.CodecFactory, kubeConfigFile string, groupVersions []schema.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) { for _, groupVersion := range groupVersions { - if !api.Registry.IsEnabledVersion(groupVersion) { + if !registry.IsEnabledVersion(groupVersion) { return nil, fmt.Errorf("webhook plugin requires enabling extension resource: %s", groupVersion) } } @@ -54,7 +53,7 @@ func NewGenericWebhook(kubeConfigFile string, groupVersions []schema.GroupVersio if err != nil { return nil, err } - codec := api.Codecs.LegacyCodec(groupVersions...) + codec := codecFactory.LegacyCodec(groupVersions...) clientConfig.ContentConfig.NegotiatedSerializer = runtimeserializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{Serializer: codec}) restClient, err := rest.UnversionedRESTClientFor(clientConfig) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go index b802533185d..06d65cc4247 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go @@ -26,6 +26,7 @@ import ( "k8s.io/apiserver/pkg/util/cache" "k8s.io/apiserver/pkg/util/webhook" authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" + "k8s.io/client-go/pkg/api" authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1" _ "k8s.io/client-go/pkg/apis/authentication/install" @@ -112,7 +113,7 @@ func (w *WebhookTokenAuthenticator) AuthenticateToken(token string) (user.Info, // and returns a TokenReviewInterface that uses that client. Note that the client submits TokenReview // requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted. func tokenReviewInterfaceFromKubeconfig(kubeConfigFile string) (authenticationclient.TokenReviewInterface, error) { - gw, err := webhook.NewGenericWebhook(kubeConfigFile, groupVersions, 0) + gw, err := webhook.NewGenericWebhook(api.Registry, api.Codecs, kubeConfigFile, groupVersions, 0) if err != nil { return nil, err } diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go index ff591ffc480..5ce041edbaf 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/util/cache" - authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" - authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" - "k8s.io/apiserver/pkg/util/webhook" + authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" + "k8s.io/client-go/pkg/api" + authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" _ "k8s.io/client-go/pkg/apis/authorization/install" ) @@ -211,7 +211,7 @@ func convertToSARExtra(extra map[string][]string) map[string]authorization.Extra // and returns a SubjectAccessReviewInterface that uses that client. Note that the client submits SubjectAccessReview // requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted. func subjectAccessReviewInterfaceFromKubeconfig(kubeConfigFile string) (authorizationclient.SubjectAccessReviewInterface, error) { - gw, err := webhook.NewGenericWebhook(kubeConfigFile, groupVersions, 0) + gw, err := webhook.NewGenericWebhook(api.Registry, api.Codecs, kubeConfigFile, groupVersions, 0) if err != nil { return nil, err } diff --git a/vendor/BUILD b/vendor/BUILD index 07397d27db9..ba7f5bf9d25 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -9131,12 +9131,11 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/apis/authorization/install", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", ], @@ -11417,46 +11416,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/api/testapi", - srcs = ["k8s.io/client-go/pkg/api/testapi/testapi.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/install", - "//vendor:k8s.io/client-go/pkg/apis/apps", - "//vendor:k8s.io/client-go/pkg/apis/apps/install", - "//vendor:k8s.io/client-go/pkg/apis/authentication/install", - "//vendor:k8s.io/client-go/pkg/apis/authorization", - "//vendor:k8s.io/client-go/pkg/apis/authorization/install", - "//vendor:k8s.io/client-go/pkg/apis/autoscaling", - "//vendor:k8s.io/client-go/pkg/apis/autoscaling/install", - "//vendor:k8s.io/client-go/pkg/apis/batch", - "//vendor:k8s.io/client-go/pkg/apis/batch/install", - "//vendor:k8s.io/client-go/pkg/apis/certificates", - "//vendor:k8s.io/client-go/pkg/apis/certificates/install", - "//vendor:k8s.io/client-go/pkg/apis/componentconfig/install", - "//vendor:k8s.io/client-go/pkg/apis/extensions", - "//vendor:k8s.io/client-go/pkg/apis/extensions/install", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/install", - "//vendor:k8s.io/client-go/pkg/apis/kubeadm", - "//vendor:k8s.io/client-go/pkg/apis/kubeadm/install", - "//vendor:k8s.io/client-go/pkg/apis/policy", - "//vendor:k8s.io/client-go/pkg/apis/policy/install", - "//vendor:k8s.io/client-go/pkg/apis/rbac", - "//vendor:k8s.io/client-go/pkg/apis/rbac/install", - "//vendor:k8s.io/client-go/pkg/apis/storage", - "//vendor:k8s.io/client-go/pkg/apis/storage/install", - "//vendor:k8s.io/client-go/pkg/federation/apis/federation", - "//vendor:k8s.io/client-go/pkg/federation/apis/federation/install", - ], -) - go_library( name = "k8s.io/client-go/pkg/api/v1", srcs = [ @@ -11876,66 +11835,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/apis/componentconfig", - srcs = [ - "k8s.io/client-go/pkg/apis/componentconfig/doc.go", - "k8s.io/client-go/pkg/apis/componentconfig/helpers.go", - "k8s.io/client-go/pkg/apis/componentconfig/register.go", - "k8s.io/client-go/pkg/apis/componentconfig/types.go", - "k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/client-go/pkg/api", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/componentconfig/install", - srcs = ["k8s.io/client-go/pkg/apis/componentconfig/install/install.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/apis/componentconfig", - "//vendor:k8s.io/client-go/pkg/apis/componentconfig/v1alpha1", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1", - srcs = [ - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/defaults.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/doc.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/register.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.defaults.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/apis/componentconfig", - "//vendor:k8s.io/client-go/pkg/kubelet/qos", - "//vendor:k8s.io/client-go/pkg/kubelet/types", - "//vendor:k8s.io/client-go/pkg/master/ports", - ], -) - go_library( name = "k8s.io/client-go/pkg/apis/extensions", srcs = [ @@ -12007,115 +11906,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/apis/imagepolicy", - srcs = [ - "k8s.io/client-go/pkg/apis/imagepolicy/doc.go", - "k8s.io/client-go/pkg/apis/imagepolicy/register.go", - "k8s.io/client-go/pkg/apis/imagepolicy/types.go", - "k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/imagepolicy/install", - srcs = ["k8s.io/client-go/pkg/apis/imagepolicy/install/install.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1", - srcs = [ - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/doc.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.pb.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.generated.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types_swagger_doc_generated.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.defaults.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/gogo/protobuf/proto", - "//vendor:github.com/gogo/protobuf/sortkeys", - "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/apis/imagepolicy", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/kubeadm", - srcs = [ - "k8s.io/client-go/pkg/apis/kubeadm/doc.go", - "k8s.io/client-go/pkg/apis/kubeadm/env.go", - "k8s.io/client-go/pkg/apis/kubeadm/register.go", - "k8s.io/client-go/pkg/apis/kubeadm/types.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/kubeadm/install", - srcs = [ - "k8s.io/client-go/pkg/apis/kubeadm/install/doc.go", - "k8s.io/client-go/pkg/apis/kubeadm/install/install.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/apis/kubeadm", - "//vendor:k8s.io/client-go/pkg/apis/kubeadm/v1alpha1", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/apis/kubeadm/v1alpha1", - srcs = [ - "k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/defaults.go", - "k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/doc.go", - "k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/register.go", - "k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/types.go", - "k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/zz_generated.defaults.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - go_library( name = "k8s.io/client-go/pkg/apis/policy", srcs = [ @@ -12298,88 +12088,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/federation/apis/federation", - srcs = [ - "k8s.io/client-go/pkg/federation/apis/federation/doc.go", - "k8s.io/client-go/pkg/federation/apis/federation/register.go", - "k8s.io/client-go/pkg/federation/apis/federation/types.go", - "k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/client-go/pkg/api", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/federation/apis/federation/install", - srcs = ["k8s.io/client-go/pkg/federation/apis/federation/install/install.go"], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/federation/apis/federation", - "//vendor:k8s.io/client-go/pkg/federation/apis/federation/v1beta1", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/federation/apis/federation/v1beta1", - srcs = [ - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/conversion.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/defaults.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/doc.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.pb.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/register.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.generated.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types_swagger_doc_generated.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.defaults.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/gogo/protobuf/proto", - "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/federation/apis/federation", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/kubelet/qos", - srcs = [ - "k8s.io/client-go/pkg/kubelet/qos/doc.go", - "k8s.io/client-go/pkg/kubelet/qos/policy.go", - "k8s.io/client-go/pkg/kubelet/qos/qos.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/kubelet/types", - ], -) - go_library( name = "k8s.io/client-go/pkg/kubelet/server/portforward", srcs = [ @@ -12397,31 +12105,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/kubelet/types", - srcs = [ - "k8s.io/client-go/pkg/kubelet/types/constants.go", - "k8s.io/client-go/pkg/kubelet/types/doc.go", - "k8s.io/client-go/pkg/kubelet/types/labels.go", - "k8s.io/client-go/pkg/kubelet/types/pod_update.go", - "k8s.io/client-go/pkg/kubelet/types/types.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/client-go/pkg/api/v1", - ], -) - -go_library( - name = "k8s.io/client-go/pkg/master/ports", - srcs = [ - "k8s.io/client-go/pkg/master/ports/doc.go", - "k8s.io/client-go/pkg/master/ports/ports.go", - ], - tags = ["automanaged"], -) - go_library( name = "k8s.io/client-go/pkg/third_party/forked/golang/json", srcs = ["k8s.io/client-go/pkg/third_party/forked/golang/json/fields.go"], @@ -13908,6 +13591,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/util/cache", "//vendor:k8s.io/apiserver/pkg/util/webhook", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/apis/authentication/install", "//vendor:k8s.io/client-go/pkg/apis/authentication/v1beta1", ], @@ -13942,6 +13626,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/util/cache", "//vendor:k8s.io/apiserver/pkg/util/webhook", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/apis/authorization/install", "//vendor:k8s.io/client-go/pkg/apis/authorization/v1beta1", ],