From 1f6fd8d1f12ad93b535fd4ff47f681e007a9b024 Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 14 Feb 2017 07:50:11 -0500 Subject: [PATCH] remove kubernetes dependencies from kube-aggregator --- cmd/kube-aggregator/hack/update-codegen.sh | 19 +++++++++++++++++++ .../pkg/apis/apiregistration/BUILD | 2 +- .../pkg/apis/apiregistration/install/BUILD | 2 +- .../apis/apiregistration/install/install.go | 2 +- .../pkg/apis/apiregistration/register.go | 4 +++- cmd/kube-aggregator/pkg/apiserver/BUILD | 8 ++++---- .../pkg/apiserver/apiserver.go | 6 +++--- .../pkg/apiserver/handler_apis.go | 2 +- .../pkg/apiserver/handler_apis_test.go | 2 +- .../clientset_generated/clientset/fake/BUILD | 2 +- .../clientset/fake/clientset_generated.go | 2 +- .../typed/apiregistration/v1alpha1/BUILD | 2 +- .../v1alpha1/apiregistration_client.go | 2 +- .../apiregistration/v1alpha1/apiservice.go | 2 +- .../internalclientset/fake/BUILD | 2 +- .../fake/clientset_generated.go | 2 +- .../apiregistration/internalversion/BUILD | 2 +- .../internalversion/apiregistration_client.go | 2 +- .../internalversion/apiservice.go | 2 +- cmd/kube-aggregator/pkg/cmd/server/BUILD | 2 +- cmd/kube-aggregator/pkg/cmd/server/start.go | 2 +- .../pkg/registry/apiservice/BUILD | 2 +- .../pkg/registry/apiservice/etcd/BUILD | 2 +- .../pkg/registry/apiservice/etcd/etcd.go | 2 +- .../pkg/registry/apiservice/strategy.go | 2 +- 25 files changed, 50 insertions(+), 29 deletions(-) diff --git a/cmd/kube-aggregator/hack/update-codegen.sh b/cmd/kube-aggregator/hack/update-codegen.sh index 0c34232190f..539f888efc1 100755 --- a/cmd/kube-aggregator/hack/update-codegen.sh +++ b/cmd/kube-aggregator/hack/update-codegen.sh @@ -22,6 +22,15 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../.. APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" +if LANG=C sed --help 2>&1 | grep -q GNU; then + SED="sed" +elif which gsed &>/dev/null; then + SED="gsed" +else + echo "Failed to find GNU sed as sed or gsed. If you are on Mac: brew install gnu-sed." >&2 + exit 1 +fi + # Register function to be called on EXIT to remove generated binary. function cleanup { rm -f "${CLIENTGEN:-}" @@ -67,3 +76,13 @@ ${informergen} \ --listers-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers \ --output-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers "$@" + + +# this is a temporary hack until we manage to update codegen to accept a scheme instead of hardcoding it +echo "rewriting imports" +grep -R -H "\"k8s.io/kubernetes/pkg" "${KUBE_ROOT}/cmd/kube-aggregator/pkg/client" | cut -d: -f1 | sort | uniq | \ + grep "\.go" | \ + xargs ${SED} -i "s|\"k8s.io/kubernetes/pkg|\"k8s.io/client-go/pkg|g" + +echo "running gofmt" +find "${KUBE_ROOT}/cmd/kube-aggregator/pkg/client" -type f -name "*.go" -print0 | xargs -0 gofmt -w diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD index 26a8f5394df..536c5fc3445 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD @@ -18,11 +18,11 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//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", ], ) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD index d7ebd07ec91..d0d64cfbbda 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD @@ -14,11 +14,11 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//pkg/api:go_default_library", "//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", ], ) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go index d0153691bcf..4a4392e1bda 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/client-go/pkg/api" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" - "k8s.io/kubernetes/pkg/api" ) func init() { diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/register.go b/cmd/kube-aggregator/pkg/apis/apiregistration/register.go index aa9a02c15c7..0f3aafa560b 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/register.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/register.go @@ -20,7 +20,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - kapi "k8s.io/kubernetes/pkg/api" + + // we register here until we separate our scheme, which requires updates to client gen + kapi "k8s.io/client-go/pkg/api" ) const GroupName = "apiregistration.k8s.io" diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 269adef1efe..bac3ed9c19d 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -19,7 +19,6 @@ go_test( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -28,6 +27,7 @@ go_test( "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/client-go/listers/core/v1", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/tools/cache", ], @@ -50,9 +50,6 @@ go_library( "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:go_default_library", - "//pkg/api:go_default_library", - "//pkg/api/install:go_default_library", - "//pkg/version:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -71,6 +68,9 @@ go_library( "//vendor:k8s.io/client-go/informers", "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/listers/core/v1", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/pkg/api/install", + "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/transport", diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index 36551a339c3..1c4142db8ef 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -30,8 +30,8 @@ import ( kubeinformers "k8s.io/client-go/informers" kubeclientset "k8s.io/client-go/kubernetes" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/version" + "k8s.io/client-go/pkg/api" + "k8s.io/client-go/pkg/version" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" @@ -40,7 +40,7 @@ import ( listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" apiservicestorage "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice/etcd" - _ "k8s.io/kubernetes/pkg/api/install" + _ "k8s.io/client-go/pkg/api/install" ) // legacyAPIServiceName is the fixed name of the only non-groupified API version diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go index 1e83cbf211f..926e8b9c9f8 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/kubernetes/pkg/api" + "k8s.io/client-go/pkg/api" apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go index 0e8f5073551..ee292fe8241 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" v1listers "k8s.io/client-go/listers/core/v1" + "k8s.io/client-go/pkg/api" corev1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD index 16eb66a06bd..913a5519f7a 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD @@ -18,11 +18,11 @@ go_library( "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index 2755dc19661..eaf29b91c90 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -21,11 +21,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/pkg/api" "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" fakev1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" - "k8s.io/kubernetes/pkg/api" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD index 4b2970dd6df..99d88795694 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD @@ -18,12 +18,12 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go index 743e260393a..6ded1c21e01 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go @@ -20,8 +20,8 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" ) type ApiregistrationV1alpha1Interface interface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go index f0ea5821893..29237e52943 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" - api "k8s.io/kubernetes/pkg/api" ) // APIServicesGetter has a method to return a APIServiceInterface. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD index 8d790a28b60..59d55d77589 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD @@ -18,11 +18,11 @@ go_library( "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index a049eb99ce3..fd41b01fa86 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -21,11 +21,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/pkg/api" "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" fakeinternalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" - "k8s.io/kubernetes/pkg/api" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD index 76b6bd31129..69c64662da6 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD @@ -18,10 +18,10 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go index f4a65d36faf..b34d12f1956 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go @@ -17,8 +17,8 @@ limitations under the License. package internalversion import ( + api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" ) type ApiregistrationInterface interface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go index 78d194a019d..4a183416ed6 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - api "k8s.io/kubernetes/pkg/api" ) // APIServicesGetter has a method to return a APIServiceInterface. diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index 63fb2481634..339a42fd15c 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -14,7 +14,6 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//cmd/kube-aggregator/pkg/apiserver:go_default_library", - "//pkg/api:go_default_library", "//vendor:github.com/spf13/cobra", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", @@ -22,6 +21,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/server/filters", "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/client-go/kubernetes", + "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go index aac3825b476..cbdc716de5a 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -29,9 +29,9 @@ import ( "k8s.io/apiserver/pkg/server/filters" genericoptions "k8s.io/apiserver/pkg/server/options" kubeclientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/pkg/api" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD index 3189950bab2..3a977d67191 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD @@ -14,7 +14,6 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -23,6 +22,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", + "//vendor:k8s.io/client-go/pkg/api", ], ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD index 780602fb976..af7df6fd724 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD @@ -14,10 +14,10 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/registry/apiservice:go_default_library", - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/client-go/pkg/api", ], ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go index e79b5af9e89..e2727337acd 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go @@ -20,9 +20,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/client-go/pkg/api" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice" - "k8s.io/kubernetes/pkg/api" ) // rest implements a RESTStorage for API services against etcd diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go index 937d6b2a8b9..8ca3f9797c6 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go @@ -27,7 +27,7 @@ import ( "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" - kapi "k8s.io/kubernetes/pkg/api" + kapi "k8s.io/client-go/pkg/api" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/validation"