From f44c288a2196b02d631b4afb1897e33f7d264401 Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 14 Feb 2017 10:00:53 -0500 Subject: [PATCH 1/3] bulk move of kube-aggregator --- cmd/BUILD | 1 - cmd/kube-aggregator/BUILD | 55 -- cmd/kube-aggregator/config.json | 16 - .../pkg/apis/apiregistration/BUILD | 45 -- .../pkg/apis/apiregistration/install/BUILD | 36 -- .../pkg/apis/apiregistration/v1alpha1/BUILD | 43 -- .../pkg/apis/apiregistration/validation/BUILD | 34 -- cmd/kube-aggregator/pkg/apiserver/BUILD | 92 ---- .../clientset_generated/clientset/BUILD | 42 -- .../clientset_generated/clientset/fake/BUILD | 41 -- .../typed/apiregistration/v1alpha1/BUILD | 45 -- .../typed/apiregistration/v1alpha1/fake/BUILD | 42 -- .../internalclientset/BUILD | 42 -- .../internalclientset/fake/BUILD | 41 -- .../apiregistration/internalversion/BUILD | 43 -- .../internalversion/fake/BUILD | 42 -- .../client/informers/externalversions/BUILD | 43 -- .../externalversions/apiregistration/BUILD | 34 -- .../apiregistration/v1alpha1/BUILD | 40 -- .../externalversions/internalinterfaces/BUILD | 32 -- .../client/informers/internalversion/BUILD | 43 -- .../internalversion/apiregistration/BUILD | 34 -- .../apiregistration/internalversion/BUILD | 40 -- .../internalversion/internalinterfaces/BUILD | 32 -- .../apiregistration/internalversion/BUILD | 37 -- .../listers/apiregistration/v1alpha1/BUILD | 38 -- cmd/kube-aggregator/pkg/cmd/server/BUILD | 40 -- .../pkg/registry/apiservice/BUILD | 43 -- .../pkg/registry/apiservice/etcd/BUILD | 35 -- hack/.linted_packages | 20 +- .../src/k8s.io}/kube-aggregator/OWNERS | 0 .../artifacts/core-apiservices/legacy.yaml | 0 .../v1.authorization.k8s.io.yaml | 0 .../core-apiservices/v1.autoscaling.yaml | 0 .../artifacts/core-apiservices/v1.batch.yaml | 0 .../v1alpha1.certificates.k8s.io.yaml | 0 .../v1alpha1.rbac.authorization.k8s.io.yaml | 0 .../core-apiservices/v1beta1.apps.yaml | 0 .../v1beta1.authentication.k8s.io.yaml | 0 .../v1beta1.authorization.k8s.io.yaml | 0 .../core-apiservices/v1beta1.extensions.yaml | 0 .../core-apiservices/v1beta1.policy.yaml | 0 .../v1beta1.storage.k8s.io.yaml | 0 .../artifacts/local-cluster-up/etcd-pod.yaml | 0 .../artifacts/local-cluster-up/etcd-svc.yaml | 0 .../local-cluster-up/kube-aggregator-pod.yaml | 0 .../local-cluster-up/kube-aggregator-sa.yaml | 0 .../local-cluster-up/kube-aggregator-svc.yaml | 0 .../artifacts/simple-image/Dockerfile | 0 .../kube-aggregator/hack/build-image.sh | 0 .../kube-aggregator/hack/update-codegen.sh | 0 .../kube-aggregator/hack/verify-codegen.sh | 0 .../src/k8s.io}/kube-aggregator/main.go | 12 +- .../pkg/apis/apiregistration/doc.go | 0 .../pkg/apis/apiregistration/helpers.go | 0 .../apis/apiregistration/install/install.go | 6 +- .../pkg/apis/apiregistration/register.go | 0 .../pkg/apis/apiregistration/types.go | 0 .../pkg/apis/apiregistration/v1alpha1/doc.go | 2 +- .../apis/apiregistration/v1alpha1/register.go | 0 .../v1alpha1/types.generated.go | 0 .../apis/apiregistration/v1alpha1/types.go | 0 .../v1alpha1/zz_generated.conversion.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 0 .../apiregistration/validation/validation.go | 2 +- .../apiregistration/zz_generated.deepcopy.go | 0 .../pkg/apiserver/apiserver.go | 12 +- .../pkg/apiserver/apiservice_controller.go | 6 +- .../pkg/apiserver/handler_apis.go | 8 +- .../pkg/apiserver/handler_apis_test.go | 4 +- .../pkg/apiserver/handler_proxy.go | 2 +- .../pkg/apiserver/handler_proxy_test.go | 2 +- .../clientset/clientset.go | 2 +- .../clientset_generated/clientset/doc.go | 0 .../clientset/fake/clientset_generated.go | 6 +- .../clientset_generated/clientset/fake/doc.go | 0 .../v1alpha1/apiregistration_client.go | 0 .../apiregistration/v1alpha1/apiservice.go | 2 +- .../typed/apiregistration/v1alpha1/doc.go | 0 .../apiregistration/v1alpha1/fake/doc.go | 0 .../fake/fake_apiregistration_client.go | 2 +- .../v1alpha1/fake/fake_apiservice.go | 2 +- .../v1alpha1/generated_expansion.go | 0 .../internalclientset/clientset.go | 2 +- .../internalclientset/doc.go | 0 .../fake/clientset_generated.go | 6 +- .../internalclientset/fake/doc.go | 0 .../internalversion/apiregistration_client.go | 0 .../internalversion/apiservice.go | 2 +- .../apiregistration/internalversion/doc.go | 0 .../internalversion/fake/doc.go | 0 .../fake/fake_apiregistration_client.go | 2 +- .../internalversion/fake/fake_apiservice.go | 2 +- .../internalversion/generated_expansion.go | 0 .../apiregistration/interface.go | 4 +- .../apiregistration/v1alpha1/apiservice.go | 8 +- .../apiregistration/v1alpha1/interface.go | 2 +- .../informers/externalversions/factory.go | 6 +- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../apiregistration/interface.go | 4 +- .../internalversion/apiservice.go | 8 +- .../internalversion/interface.go | 2 +- .../informers/internalversion/factory.go | 6 +- .../informers/internalversion/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../internalversion/apiservice.go | 2 +- .../internalversion/expansion_generated.go | 0 .../apiregistration/v1alpha1/apiservice.go | 4 +- .../v1alpha1/expansion_generated.go | 0 .../kube-aggregator/pkg/cmd/server/start.go | 4 +- .../pkg/registry/apiservice/etcd/etcd.go | 4 +- .../pkg/registry/apiservice/strategy.go | 4 +- vendor/BUILD | 517 ++++++++++++++++++ 114 files changed, 603 insertions(+), 1237 deletions(-) delete mode 100644 cmd/kube-aggregator/BUILD delete mode 100644 cmd/kube-aggregator/config.json delete mode 100644 cmd/kube-aggregator/pkg/apis/apiregistration/BUILD delete mode 100644 cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD delete mode 100644 cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD delete mode 100644 cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD delete mode 100644 cmd/kube-aggregator/pkg/apiserver/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/externalversions/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/internalversion/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD delete mode 100644 cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD delete mode 100644 cmd/kube-aggregator/pkg/cmd/server/BUILD delete mode 100644 cmd/kube-aggregator/pkg/registry/apiservice/BUILD delete mode 100644 cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD rename {cmd => staging/src/k8s.io}/kube-aggregator/OWNERS (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/legacy.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1.authorization.k8s.io.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-pod.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-sa.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-svc.yaml (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/artifacts/simple-image/Dockerfile (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/hack/build-image.sh (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/hack/update-codegen.sh (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/hack/verify-codegen.sh (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/main.go (67%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/helpers.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/install/install.go (87%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/register.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/types.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go (89%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/validation/validation.go (97%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apiserver/apiserver.go (95%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apiserver/apiservice_controller.go (93%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apiserver/handler_apis.go (94%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apiserver/handler_apis_test.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apiserver/handler_proxy.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/apiserver/handler_proxy_test.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go (96%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go (86%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go (89%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go (97%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go (94%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go (83%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go (87%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go (98%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go (83%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go (83%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go (91%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/externalversions/factory.go (89%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/externalversions/generic.go (95%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go (92%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go (83%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go (83%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go (91%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/internalversion/factory.go (89%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/internalversion/generic.go (96%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go (91%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go (96%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go (92%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go (100%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/cmd/server/start.go (96%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go (93%) rename {cmd => staging/src/k8s.io}/kube-aggregator/pkg/registry/apiservice/strategy.go (95%) diff --git a/cmd/BUILD b/cmd/BUILD index c1cef9f5864..bfa8e5ccd07 100644 --- a/cmd/BUILD +++ b/cmd/BUILD @@ -23,7 +23,6 @@ filegroup( "//cmd/genutils:all-srcs", "//cmd/genyaml:all-srcs", "//cmd/hyperkube:all-srcs", - "//cmd/kube-aggregator:all-srcs", "//cmd/kube-apiserver:all-srcs", "//cmd/kube-controller-manager:all-srcs", "//cmd/kube-discovery:all-srcs", diff --git a/cmd/kube-aggregator/BUILD b/cmd/kube-aggregator/BUILD deleted file mode 100644 index 3d047c1c5fa..00000000000 --- a/cmd/kube-aggregator/BUILD +++ /dev/null @@ -1,55 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_binary", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["main.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration/install:go_default_library", - "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/cmd/server:go_default_library", - "//vendor:k8s.io/apiserver/pkg/util/logs", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/apis/apiregistration:all-srcs", - "//cmd/kube-aggregator/pkg/apiserver:all-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:all-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:all-srcs", - "//cmd/kube-aggregator/pkg/client/informers/externalversions:all-srcs", - "//cmd/kube-aggregator/pkg/client/informers/internalversion:all-srcs", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:all-srcs", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:all-srcs", - "//cmd/kube-aggregator/pkg/cmd/server:all-srcs", - "//cmd/kube-aggregator/pkg/registry/apiservice:all-srcs", - ], - tags = ["automanaged"], -) - -go_binary( - name = "kube-aggregator", - library = ":go_default_library", - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/config.json b/cmd/kube-aggregator/config.json deleted file mode 100644 index a56fc367b16..00000000000 --- a/cmd/kube-aggregator/config.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "servers": [ - { - "serverAddress": "http://127.0.0.1:8083", - "groupVersionDiscoveryPaths": [ - { - "path": "/apis" - }, - { - "path": "/api", - "isLegacy": true - } - ] - } - ] -} diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD deleted file mode 100644 index 536c5fc3445..00000000000 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD +++ /dev/null @@ -1,45 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "helpers.go", - "register.go", - "types.go", - "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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/apis/apiregistration/install:all-srcs", - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:all-srcs", - "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD deleted file mode 100644 index d0d64cfbbda..00000000000 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD +++ /dev/null @@ -1,36 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["install.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1: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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD deleted file mode 100644 index f4814fa9e1f..00000000000 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "register.go", - "types.generated.go", - "types.go", - "zz_generated.conversion.go", - "zz_generated.deepcopy.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD deleted file mode 100644 index dbc7f690de0..00000000000 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD +++ /dev/null @@ -1,34 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["validation.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/validation", - "//vendor:k8s.io/apimachinery/pkg/api/validation/path", - "//vendor:k8s.io/apimachinery/pkg/util/validation", - "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD deleted file mode 100644 index bac3ed9c19d..00000000000 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ /dev/null @@ -1,92 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "handler_apis_test.go", - "handler_proxy_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//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", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "apiserver.go", - "apiservice_controller.go", - "handler_apis.go", - "handler_proxy.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/internalversion:go_default_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", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/endpoints/filters", - "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/registry/generic/rest", - "//vendor:k8s.io/apiserver/pkg/registry/rest", - "//vendor:k8s.io/apiserver/pkg/server", - "//vendor:k8s.io/apiserver/pkg/server/filters", - "//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", - "//vendor:k8s.io/client-go/util/workqueue", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD deleted file mode 100644 index 56415d8c658..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "clientset.go", - "doc.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/client-go/discovery", - "//vendor:k8s.io/client-go/plugin/pkg/client/auth", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/util/flowcontrol", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake:all-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD deleted file mode 100644 index 913a5519f7a..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "clientset_generated.go", - "doc.go", - ], - tags = ["automanaged"], - deps = [ - "//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", - "//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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) 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 deleted file mode 100644 index 99d88795694..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD +++ /dev/null @@ -1,45 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "apiregistration_client.go", - "apiservice.go", - "doc.go", - "generated_expansion.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1: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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD deleted file mode 100644 index 3950b38e3a8..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "fake_apiregistration_client.go", - "fake_apiservice.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/testing", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD deleted file mode 100644 index b041e3781ce..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "clientset.go", - "doc.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/client-go/discovery", - "//vendor:k8s.io/client-go/plugin/pkg/client/auth", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/util/flowcontrol", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake:all-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD deleted file mode 100644 index 59d55d77589..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "clientset_generated.go", - "doc.go", - ], - tags = ["automanaged"], - deps = [ - "//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", - "//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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) 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 deleted file mode 100644 index 69c64662da6..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "apiregistration_client.go", - "apiservice.go", - "doc.go", - "generated_expansion.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration: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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD deleted file mode 100644 index 8e1e7a69156..00000000000 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "fake_apiregistration_client.go", - "fake_apiservice.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/testing", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/BUILD b/cmd/kube-aggregator/pkg/client/informers/externalversions/BUILD deleted file mode 100644 index c864efad44e..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "factory.go", - "generic.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration:all-srcs", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/BUILD b/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/BUILD deleted file mode 100644 index 77dc4ce51ff..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/BUILD +++ /dev/null @@ -1,34 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["interface.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/BUILD deleted file mode 100644 index 1e5c727f930..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/BUILD +++ /dev/null @@ -1,40 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "apiservice.go", - "interface.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/BUILD b/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/BUILD deleted file mode 100644 index b8023291017..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["factory_interfaces.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/informers/internalversion/BUILD deleted file mode 100644 index 511b85232ae..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "factory.go", - "generic.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration:all-srcs", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/BUILD b/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/BUILD deleted file mode 100644 index 6109f2ad81d..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/BUILD +++ /dev/null @@ -1,34 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["interface.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/BUILD deleted file mode 100644 index 84e9478a2fc..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/BUILD +++ /dev/null @@ -1,40 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "apiservice.go", - "interface.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces:go_default_library", - "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/BUILD b/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/BUILD deleted file mode 100644 index aab41e9552d..00000000000 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["factory_interfaces.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD deleted file mode 100644 index 09812b2582a..00000000000 --- a/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD +++ /dev/null @@ -1,37 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "apiservice.go", - "expansion_generated.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD deleted file mode 100644 index c566ca2bc34..00000000000 --- a/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD +++ /dev/null @@ -1,38 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "apiservice.go", - "expansion_generated.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/client-go/tools/cache", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD deleted file mode 100644 index 339a42fd15c..00000000000 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ /dev/null @@ -1,40 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["start.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kube-aggregator/pkg/apiserver:go_default_library", - "//vendor:github.com/spf13/cobra", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/server", - "//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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD deleted file mode 100644 index 3a977d67191..00000000000 --- a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["strategy.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD deleted file mode 100644 index af7df6fd724..00000000000 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD +++ /dev/null @@ -1,35 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//cmd/kube-aggregator/pkg/registry/apiservice: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", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/hack/.linted_packages b/hack/.linted_packages index dec1eab79e5..11847a3178d 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -8,16 +8,6 @@ cmd/genkubedocs cmd/genman cmd/genswaggertypedocs cmd/genyaml -cmd/kube-aggregator -cmd/kube-aggregator/pkg/apis/apiregistration/install -cmd/kube-aggregator/pkg/client/informers/externalversions -cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration -cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1 -cmd/kube-aggregator/pkg/client/informers/internalversion -cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration -cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion -cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion -cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1 cmd/kube-apiserver cmd/kube-apiserver/app cmd/kube-apiserver/app/options @@ -357,6 +347,16 @@ staging/src/k8s.io/client-go/tools/metrics staging/src/k8s.io/client-go/util/cert staging/src/k8s.io/client-go/util/homedir staging/src/k8s.io/client-go/util/workqueue +staging/src/k8s.io/kube-aggregator +staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install +staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions +staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration +staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1 +staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion +staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration +staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion +staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion +staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1 staging/src/k8s.io/sample-apiserver staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install test/e2e/perftype diff --git a/cmd/kube-aggregator/OWNERS b/staging/src/k8s.io/kube-aggregator/OWNERS similarity index 100% rename from cmd/kube-aggregator/OWNERS rename to staging/src/k8s.io/kube-aggregator/OWNERS diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/legacy.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/legacy.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/legacy.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/legacy.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1.authorization.k8s.io.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1.authorization.k8s.io.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1.authorization.k8s.io.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1.authorization.k8s.io.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml diff --git a/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml diff --git a/cmd/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml diff --git a/cmd/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml diff --git a/cmd/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-pod.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-pod.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-pod.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-pod.yaml diff --git a/cmd/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-sa.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-sa.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-sa.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-sa.yaml diff --git a/cmd/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-svc.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-svc.yaml similarity index 100% rename from cmd/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-svc.yaml rename to staging/src/k8s.io/kube-aggregator/artifacts/local-cluster-up/kube-aggregator-svc.yaml diff --git a/cmd/kube-aggregator/artifacts/simple-image/Dockerfile b/staging/src/k8s.io/kube-aggregator/artifacts/simple-image/Dockerfile similarity index 100% rename from cmd/kube-aggregator/artifacts/simple-image/Dockerfile rename to staging/src/k8s.io/kube-aggregator/artifacts/simple-image/Dockerfile diff --git a/cmd/kube-aggregator/hack/build-image.sh b/staging/src/k8s.io/kube-aggregator/hack/build-image.sh similarity index 100% rename from cmd/kube-aggregator/hack/build-image.sh rename to staging/src/k8s.io/kube-aggregator/hack/build-image.sh diff --git a/cmd/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh similarity index 100% rename from cmd/kube-aggregator/hack/update-codegen.sh rename to staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh diff --git a/cmd/kube-aggregator/hack/verify-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh similarity index 100% rename from cmd/kube-aggregator/hack/verify-codegen.sh rename to staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh diff --git a/cmd/kube-aggregator/main.go b/staging/src/k8s.io/kube-aggregator/main.go similarity index 67% rename from cmd/kube-aggregator/main.go rename to staging/src/k8s.io/kube-aggregator/main.go index 25fdbe85b9a..b61a259548b 100644 --- a/cmd/kube-aggregator/main.go +++ b/staging/src/k8s.io/kube-aggregator/main.go @@ -22,14 +22,14 @@ import ( "runtime" "k8s.io/apiserver/pkg/util/logs" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/cmd/server" + "k8s.io/kube-aggregator/pkg/cmd/server" // force compilation of packages we'll later rely upon - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/install" - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/validation" - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" - _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" + _ "k8s.io/kube-aggregator/pkg/apis/apiregistration/install" + _ "k8s.io/kube-aggregator/pkg/apis/apiregistration/validation" + _ "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" + _ "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + _ "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" ) func main() { diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/helpers.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/helpers.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install/install.go similarity index 87% rename from cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install/install.go index 4a4392e1bda..809259de841 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install/install.go @@ -22,8 +22,8 @@ import ( "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/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) func init() { @@ -37,7 +37,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r GroupName: apiregistration.GroupName, RootScopedKinds: sets.NewString("APIService"), VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration", + ImportPrefix: "k8s.io/kube-aggregator/pkg/apis/apiregistration", AddInternalObjectsToScheme: apiregistration.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/register.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/register.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/types.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/types.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go similarity index 89% rename from cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go index f1ed61aa8f2..02432b3add0 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go @@ -15,7 +15,7 @@ limitations under the License. */ // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration +// +k8s:conversion-gen=k8s.io/kube-aggregator/pkg/apis/apiregistration // Package v1alpha1 is the v1alpha1 version of the API. // +groupName=apiregistration.k8s.io diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go similarity index 98% rename from cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go index debd300b94f..0e3cf6469fa 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" unsafe "unsafe" ) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation/validation.go similarity index 97% rename from cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation/validation.go index 886b320f876..94ff63fb7cb 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation/validation.go @@ -24,7 +24,7 @@ import ( utilvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" - discoveryapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + discoveryapi "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) func ValidateAPIService(apiServer *discoveryapi.APIService) field.ErrorList { diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go similarity index 100% rename from cmd/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go rename to staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go similarity index 95% rename from cmd/kube-aggregator/pkg/apiserver/apiserver.go rename to staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go index 1c4142db8ef..61cade27464 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go @@ -33,12 +33,12 @@ import ( "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" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" - informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion" - 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/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" + informers "k8s.io/kube-aggregator/pkg/client/informers/internalversion" + listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + apiservicestorage "k8s.io/kube-aggregator/pkg/registry/apiservice/etcd" _ "k8s.io/client-go/pkg/api/install" ) diff --git a/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go similarity index 93% rename from cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go rename to staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go index 46c539268fb..5cc31b93546 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" - listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + "k8s.io/kube-aggregator/pkg/apis/apiregistration" + informers "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" + listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) type APIHandlerManager interface { diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go similarity index 94% rename from cmd/kube-aggregator/pkg/apiserver/handler_apis.go rename to staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go index 926e8b9c9f8..fac2853f960 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go @@ -28,10 +28,10 @@ import ( v1listers "k8s.io/client-go/listers/core/v1" "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" - informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" - listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + apiregistrationapi "k8s.io/kube-aggregator/pkg/apis/apiregistration" + apiregistrationv1alpha1api "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + informers "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" + listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) // WithAPIs adds the handling for /apis and /apis/. diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go similarity index 98% rename from cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go rename to staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go index ee292fe8241..8e06be41922 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go @@ -32,8 +32,8 @@ import ( corev1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + "k8s.io/kube-aggregator/pkg/apis/apiregistration" + listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) type delegationHTTPHandler struct { diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go similarity index 98% rename from cmd/kube-aggregator/pkg/apiserver/handler_proxy.go rename to staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go index 09c44fb2768..c62a62b8f08 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go @@ -29,7 +29,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/transport" - apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + apiregistrationapi "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) // proxyHandler provides a http.Handler which will proxy traffic to locations diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go similarity index 98% rename from cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go rename to staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go index 512f4bb372b..642250f9872 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) type targetHTTPHandler struct { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go similarity index 96% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index 15fc700f22a..f7a0713c704 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -22,7 +22,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" "k8s.io/client-go/util/flowcontrol" - v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + v1alpha1apiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" ) type Interface interface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go similarity index 86% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index eaf29b91c90..7b64aeb2778 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -23,9 +23,9 @@ import ( 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" + clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" + v1alpha1apiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + fakev1alpha1apiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go similarity index 98% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go index 29237e52943..bd9d8ca9628 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go @@ -22,7 +22,7 @@ import ( 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" + v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) // APIServicesGetter has a method to return a APIServiceInterface. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go similarity index 89% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go index d8d73d00a6d..b49c056021c 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go @@ -19,7 +19,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + v1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" ) type FakeApiregistrationV1alpha1 struct { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go similarity index 97% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go index 9dada75dd60..f8a86f03031 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) // FakeAPIServices implements APIServiceInterface diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go similarity index 94% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index 0419478ba20..eb2e632f4a9 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -22,7 +22,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" "k8s.io/client-go/util/flowcontrol" - internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + internalversionapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" ) type Interface interface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go similarity index 83% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index fd41b01fa86..e1b50918a62 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -23,9 +23,9 @@ import ( 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" + clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" + internalversionapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + fakeinternalversionapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go similarity index 98% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go index 4a183416ed6..d8116f26ac7 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go @@ -22,7 +22,7 @@ import ( 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" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) // APIServicesGetter has a method to return a APIServiceInterface. diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go similarity index 87% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go index 460f3303ce9..3525e01db70 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go @@ -19,7 +19,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + internalversion "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" ) type FakeApiregistration struct { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go similarity index 98% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go index 33e94a8b918..4306e0ca6ab 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) // FakeAPIServices implements APIServiceInterface diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go similarity index 83% rename from cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go index cf8c651446e..72f238bd8a2 100644 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go @@ -19,8 +19,8 @@ limitations under the License. package apiregistration import ( - v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1" - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go similarity index 83% rename from cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go index 557a96cbaae..d09cfcd56d2 100644 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go @@ -23,10 +23,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apiregistration_v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" - clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" + apiregistration_v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" time "time" ) diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go similarity index 91% rename from cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go index c77be674723..016e05bd31d 100644 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/factory.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go similarity index 89% rename from cmd/kube-aggregator/pkg/client/informers/externalversions/factory.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go index 80ff7ff1d87..a4ab4234929 100644 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/factory.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go @@ -22,9 +22,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/apiregistration" - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" + clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" + apiregistration "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces" reflect "reflect" sync "sync" time "time" diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/generic.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/generic.go similarity index 95% rename from cmd/kube-aggregator/pkg/client/informers/externalversions/generic.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/generic.go index 66f80361c29..739fbec294b 100644 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/generic.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/generic.go @@ -22,7 +22,7 @@ import ( "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 92% rename from cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 1aacc4c9fdf..5b83ed72ab9 100644 --- a/cmd/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" time "time" ) diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go similarity index 83% rename from cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go index e9bd4bdd003..daa61f6fbad 100644 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go @@ -19,8 +19,8 @@ limitations under the License. package apiregistration import ( - internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" + internalversion "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go similarity index 83% rename from cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go index e06c8900431..3e4b5b7f202 100644 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go @@ -23,10 +23,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" - internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" + internalclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" + internalversion "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" time "time" ) diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go similarity index 91% rename from cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go index 858c02acc5f..b5ee434578e 100644 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go @@ -19,7 +19,7 @@ limitations under the License. package internalversion import ( - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/factory.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/factory.go similarity index 89% rename from cmd/kube-aggregator/pkg/client/informers/internalversion/factory.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/factory.go index 753a65d9501..2724a133d44 100644 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/factory.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/factory.go @@ -22,9 +22,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration" - internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" + internalclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" + apiregistration "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration" + internalinterfaces "k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces" reflect "reflect" sync "sync" time "time" diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/generic.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/generic.go similarity index 96% rename from cmd/kube-aggregator/pkg/client/informers/internalversion/generic.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/generic.go index 6ef79d24dce..91483618526 100644 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/generic.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/generic.go @@ -22,7 +22,7 @@ import ( "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go similarity index 91% rename from cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go index 8fb5e2b481d..b07867e1ce5 100644 --- a/cmd/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" + internalclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" time "time" ) diff --git a/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go similarity index 96% rename from cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go index d701a792d85..24f2409d997 100644 --- a/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) // APIServiceLister helps list APIServices. diff --git a/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go diff --git a/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go similarity index 92% rename from cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go index e9697bce2eb..f5a1303927c 100644 --- a/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go @@ -23,8 +23,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" + v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) // APIServiceLister helps list APIServices. diff --git a/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go b/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go similarity index 100% rename from cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go rename to staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go similarity index 96% rename from cmd/kube-aggregator/pkg/cmd/server/start.go rename to staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go index cbdc716de5a..0f006d61917 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go @@ -31,9 +31,9 @@ import ( 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/kube-aggregator/pkg/apiserver" - "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) const defaultEtcdPathPrefix = "/registry/kube-aggregator.kubernetes.io/" diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go b/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go similarity index 93% rename from cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go rename to staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go index e2727337acd..84fcaac28e0 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go @@ -21,8 +21,8 @@ import ( "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/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kube-aggregator/pkg/registry/apiservice" ) // rest implements a RESTStorage for API services against etcd diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go b/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/strategy.go similarity index 95% rename from cmd/kube-aggregator/pkg/registry/apiservice/strategy.go rename to staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/strategy.go index 8ca3f9797c6..bf24c520b65 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/strategy.go @@ -29,8 +29,8 @@ import ( "k8s.io/apiserver/pkg/storage/names" 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" + "k8s.io/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kube-aggregator/pkg/apis/apiregistration/validation" ) type apiServerStrategy struct { diff --git a/vendor/BUILD b/vendor/BUILD index 3028203a4db..773169b4535 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -16327,3 +16327,520 @@ go_library( "//vendor:k8s.io/client-go/tools/cache", ], ) + +go_binary( + name = "k8s.io/kube-aggregator_bin", + library = ":k8s.io/kube-aggregator", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/kube-aggregator", + srcs = ["k8s.io/kube-aggregator/main.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apiserver/pkg/util/logs", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/install", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/validation", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion", + "//vendor:k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/cmd/server", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/apis/apiregistration", + srcs = [ + "k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/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/kube-aggregator/pkg/apis/apiregistration/install", + srcs = ["k8s.io/kube-aggregator/pkg/apis/apiregistration/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/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + srcs = [ + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go", + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go", + ], + tags = ["automanaged"], + deps = [ + "//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/kube-aggregator/pkg/apis/apiregistration", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/apis/apiregistration/validation", + srcs = ["k8s.io/kube-aggregator/pkg/apis/apiregistration/validation/validation.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/validation", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", + "//vendor:k8s.io/apimachinery/pkg/util/validation", + "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + ], +) + +go_test( + name = "k8s.io/kube-aggregator/pkg/apiserver_test", + srcs = [ + "k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go", + "k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go", + ], + library = ":k8s.io/kube-aggregator/pkg/apiserver", + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/apiserver", + srcs = [ + "k8s.io/kube-aggregator/pkg/apiserver/apiserver.go", + "k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go", + "k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go", + "k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/endpoints/filters", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic/rest", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/filters", + "//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", + "//vendor:k8s.io/client-go/util/workqueue", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion", + "//vendor:k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion", + "//vendor:k8s.io/kube-aggregator/pkg/registry/apiservice/etcd", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/client-go/discovery", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go", + ], + tags = ["automanaged"], + deps = [ + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go", + ], + tags = ["automanaged"], + deps = [ + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/client-go/discovery", + "//vendor:k8s.io/client-go/plugin/pkg/client/auth", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/flowcontrol", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go", + ], + tags = ["automanaged"], + deps = [ + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go", + ], + tags = ["automanaged"], + deps = [ + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/externalversions", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go", + "k8s.io/kube-aggregator/pkg/client/informers/externalversions/generic.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration", + srcs = ["k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/interface.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/apiservice.go", + "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1/interface.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces", + "//vendor:k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces", + srcs = ["k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/internalversion", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/informers/internalversion/factory.go", + "k8s.io/kube-aggregator/pkg/client/informers/internalversion/generic.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration", + srcs = ["k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/interface.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/apiservice.go", + "k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion/interface.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + "//vendor:k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces", + "//vendor:k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces", + srcs = ["k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go", + "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go", + "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/client-go/tools/cache", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/cmd/server", + srcs = ["k8s.io/kube-aggregator/pkg/cmd/server/start.go"], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/spf13/cobra", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/server", + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/apiserver", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/registry/apiservice", + srcs = ["k8s.io/kube-aggregator/pkg/registry/apiservice/strategy.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/validation", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/registry/apiservice/etcd", + srcs = ["k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go"], + tags = ["automanaged"], + deps = [ + "//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", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/registry/apiservice", + ], +) From 1d40c3ff76a2274c7209edf3a99637e4c1df5377 Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 14 Feb 2017 10:04:28 -0500 Subject: [PATCH 2/3] update scripts for new kube-aggregator location --- build/BUILD | 2 +- build/release-tars/BUILD | 2 +- hack/godep-save.sh | 3 ++ hack/lib/golang.sh | 2 +- hack/local-up-cluster.sh | 2 +- hack/local-up-kube-aggregator.sh | 8 ++--- hack/make-rules/test.sh | 3 ++ hack/update-codegen.sh | 2 +- hack/verify-codegen.sh | 2 +- hack/verify-staging-imports.sh | 7 +++-- .../kube-aggregator/hack/build-image.sh | 6 ++-- .../kube-aggregator/hack/update-codegen.sh | 31 ++++++++++--------- .../kube-aggregator/hack/verify-codegen.sh | 2 +- vendor/k8s.io/kube-aggregator | 1 + 14 files changed, 41 insertions(+), 32 deletions(-) create mode 120000 vendor/k8s.io/kube-aggregator diff --git a/build/BUILD b/build/BUILD index dbf1f0e3ee0..c89454ecfda 100644 --- a/build/BUILD +++ b/build/BUILD @@ -65,7 +65,7 @@ DOCKERIZED_BINARIES = { }, "kube-aggregator": { "base": ":busybox-libc", - "target": "//cmd/kube-aggregator:kube-aggregator", + "target": "//vendor/k8s.io/kube-aggregator:kube-aggregator", }, "kube-proxy": { "base": ":busybox-net", diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD index a8df00cb712..5b0a1debc5f 100644 --- a/build/release-tars/BUILD +++ b/build/release-tars/BUILD @@ -69,7 +69,7 @@ NODE_TARGETS = [ # since we include them in the actual build rule. SERVER_TARGETS = [ "//cmd/hyperkube", - "//cmd/kube-aggregator", + "//vendor/k8s.io/kube-aggregator", "//cmd/kube-apiserver", "//cmd/kube-controller-manager", "//cmd/kube-discovery", diff --git a/hack/godep-save.sh b/hack/godep-save.sh index a66cc679bf6..87d017e499b 100755 --- a/hack/godep-save.sh +++ b/hack/godep-save.sh @@ -47,6 +47,9 @@ pushd "${KUBE_ROOT}" > /dev/null if [ ! -e "vendor/k8s.io/apimachinery" ]; then ln -s ../../staging/src/k8s.io/apimachinery vendor/k8s.io/apimachinery fi + if [ ! -e "vendor/k8s.io/kube-aggregator" ]; then + ln -s ../../staging/src/k8s.io/kube-aggregator vendor/k8s.io/kube-aggregator + fi if [ ! -e "vendor/k8s.io/sample-apiserver" ]; then ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver fi diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 8e57e6915fd..a8022826c96 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -32,7 +32,7 @@ kube::golang::server_targets() { cmd/kubeadm cmd/hyperkube cmd/kube-discovery - cmd/kube-aggregator + vendor/k8s.io/kube-aggregator plugin/cmd/kube-scheduler ) echo "${targets[@]}" diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 261db2a6892..e963e98ff42 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -144,7 +144,7 @@ do done if [ "x$GO_OUT" == "x" ]; then - make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube cmd/kube-aggregator" + make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube vendor/k8s.io/kube-aggregator" else echo "skipped the build." fi diff --git a/hack/local-up-kube-aggregator.sh b/hack/local-up-kube-aggregator.sh index 6a3442dca8e..5440dc86941 100755 --- a/hack/local-up-kube-aggregator.sh +++ b/hack/local-up-kube-aggregator.sh @@ -66,7 +66,7 @@ function start_kube-aggregator { # make sure the resources we're about to create don't exist kubectl_core -n kube-public delete secret auth-proxy-client serving-etcd serving-kube-aggregator kube-aggregator-etcd > /dev/null 2>&1 || true kubectl_core -n kube-public delete configmap etcd-ca kube-aggregator-ca client-ca request-header-ca > /dev/null 2>&1 || true - kubectl_core -n kube-public delete -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/local-cluster-up" > /dev/null 2>&1 || true + kubectl_core -n kube-public delete -f "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/local-cluster-up" > /dev/null 2>&1 || true sudo_kubectl_core -n kube-public create secret tls auth-proxy-client --cert="${CERT_DIR}/client-auth-proxy.crt" --key="${CERT_DIR}/client-auth-proxy.key" sudo_kubectl_core -n kube-public create secret tls serving-etcd --cert="${CERT_DIR}/serving-etcd.crt" --key="${CERT_DIR}/serving-etcd.key" @@ -77,9 +77,9 @@ function start_kube-aggregator { kubectl_core -n kube-public create configmap client-ca --from-file="ca.crt=${CERT_DIR}/client-ca.crt" || true kubectl_core -n kube-public create configmap request-header-ca --from-file="ca.crt=${CERT_DIR}/request-header-ca.crt" || true - ${KUBE_ROOT}/cmd/kube-aggregator/hack/build-image.sh + ${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/hack/build-image.sh - kubectl_core -n kube-public create -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/local-cluster-up" + kubectl_core -n kube-public create -f "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/local-cluster-up" ${sudo} cp "${CERT_DIR}/admin.kubeconfig" "${CERT_DIR}/admin-kube-aggregator.kubeconfig" ${sudo} chown ${USER} "${CERT_DIR}/admin-kube-aggregator.kubeconfig" @@ -94,7 +94,7 @@ function start_kube-aggregator { sleep 1 # create the "normal" api services for the core API server - ${kubectl} --kubeconfig="${CERT_DIR}/admin-kube-aggregator.kubeconfig" create -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/core-apiservices" + ${kubectl} --kubeconfig="${CERT_DIR}/admin-kube-aggregator.kubeconfig" create -f "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/core-apiservices" } kube::util::test_openssl_installed diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index c3cbfd3d02f..cbb23652b8f 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -67,6 +67,9 @@ kube::test::find_dirs() { # run tests for apimachinery find ./staging/src/k8s.io/apimachinery -name '*_test.go' \ -name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./staging/src/|./vendor/|' | LC_ALL=C sort -u + + find ./staging/src/k8s.io/kube-aggregator -name '*_test.go' \ + -name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./staging/src/|./vendor/|' | LC_ALL=C sort -u ) } diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 7b798d23606..0f407cce5a1 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -101,4 +101,4 @@ ${informergen} \ # You may add additional calls of code generators like set-gen above. # call generation on sub-project for now -cmd/kube-aggregator/hack/update-codegen.sh +vendor/k8s.io/kube-aggregator/hack/update-codegen.sh diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 6b70557629e..80910243dc2 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -24,7 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env # call verify on sub-project for now -cmd/kube-aggregator/hack/verify-codegen.sh +vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only diff --git a/hack/verify-staging-imports.sh b/hack/verify-staging-imports.sh index b48441079af..9a299eca312 100755 --- a/hack/verify-staging-imports.sh +++ b/hack/verify-staging-imports.sh @@ -51,9 +51,10 @@ function print_forbidden_imports () { RC=0 print_forbidden_imports apimachinery k8s.io/ || RC=1 -print_forbidden_imports apiserver k8s.io/kubernetes || RC=1 -print_forbidden_imports client-go k8s.io/kubernetes k8s.io/apiserver || RC=1 -print_forbidden_imports sample-apiserver k8s.io/kubernetes || RC=1 +print_forbidden_imports apiserver k8s.io/kubernetes k8s.io/sample-apiserver k8s.io/kube-aggregator || RC=1 +print_forbidden_imports client-go k8s.io/kubernetes k8s.io/apiserver k8s.io/sample-apiserver k8s.io/kube-aggregator || RC=1 +print_forbidden_imports kube-aggregator k8s.io/kubernetes k8s.io/sample-apiserver || RC=1 +print_forbidden_imports sample-apiserver k8s.io/kubernetes k8s.io/kube-aggregator || RC=1 if [ ${RC} != 0 ]; then exit ${RC} fi diff --git a/staging/src/k8s.io/kube-aggregator/hack/build-image.sh b/staging/src/k8s.io/kube-aggregator/hack/build-image.sh index c753eee9bba..014252f3046 100755 --- a/staging/src/k8s.io/kube-aggregator/hack/build-image.sh +++ b/staging/src/k8s.io/kube-aggregator/hack/build-image.sh @@ -20,9 +20,9 @@ source "${KUBE_ROOT}/hack/lib/util.sh" # Register function to be called on EXIT to remove generated binary. function cleanup { - rm "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image/kube-aggregator" + rm "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/simple-image/kube-aggregator" } trap cleanup EXIT -cp -v ${KUBE_ROOT}/_output/local/bin/linux/amd64/kube-aggregator "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image/kube-aggregator" -docker build -t kube-aggregator:latest ${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image +cp -v ${KUBE_ROOT}/_output/local/bin/linux/amd64/kube-aggregator "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/simple-image/kube-aggregator" +docker build -t kube-aggregator:latest ${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/simple-image diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh index 539f888efc1..6e4aab5ec59 100755 --- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh +++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../.. +KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../.. APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" @@ -43,26 +43,26 @@ echo "Building client-gen" CLIENTGEN="${PWD}/client-gen-binary" go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen -PREFIX=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis +PREFIX=k8s.io/kube-aggregator/pkg/apis INPUT_BASE="--input-base ${PREFIX}" INPUT_APIS=( apiregistration/ apiregistration/v1alpha1 ) INPUT="--input ${INPUT_APIS[@]}" -CLIENTSET_PATH="--clientset-path k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated" +CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated" -${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} -${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} +${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor +${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor echo "Building lister-gen" listergen="${PWD}/lister-gen" go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen -LISTER_INPUT="--input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" -LISTER_PATH="--output-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers" -${listergen} ${LISTER_INPUT} ${LISTER_PATH} +LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" +LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers" +${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor echo "Building informer-gen" @@ -70,19 +70,20 @@ informergen="${PWD}/informer-gen" go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen ${informergen} \ - --input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1 \ - --versioned-clientset-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset \ - --internal-clientset-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset \ - --listers-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers \ - --output-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers + --output-base ${KUBE_ROOT}/vendor \ + --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1 \ + --versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \ + --internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \ + --listers-package k8s.io/kube-aggregator/pkg/client/listers \ + --output-package k8s.io/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 -R -H "\"k8s.io/kubernetes/pkg" "${KUBE_ROOT}/vendor/k8s.io/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 +find "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/pkg/client" -type f -name "*.go" -print0 | xargs -0 gofmt -w diff --git a/staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh index 79a834b4cab..4c6f51af8bf 100755 --- a/staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh +++ b/staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../.. +KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../.. APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" diff --git a/vendor/k8s.io/kube-aggregator b/vendor/k8s.io/kube-aggregator new file mode 120000 index 00000000000..0047935ae76 --- /dev/null +++ b/vendor/k8s.io/kube-aggregator @@ -0,0 +1 @@ +../../staging/src/k8s.io/kube-aggregator \ No newline at end of file From ab0a57760eb4a50df432f3091d472bb13c75d38c Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 14 Feb 2017 10:57:07 -0500 Subject: [PATCH 3/3] remove kube-aggregator from bazel until we can build it --- build/BUILD | 4 ---- build/release-tars/BUILD | 1 - 2 files changed, 5 deletions(-) diff --git a/build/BUILD b/build/BUILD index c89454ecfda..2469ad3a347 100644 --- a/build/BUILD +++ b/build/BUILD @@ -63,10 +63,6 @@ DOCKERIZED_BINARIES = { "base": ":busybox-libc", "target": "//plugin/cmd/kube-scheduler:kube-scheduler", }, - "kube-aggregator": { - "base": ":busybox-libc", - "target": "//vendor/k8s.io/kube-aggregator:kube-aggregator", - }, "kube-proxy": { "base": ":busybox-net", "target": "//cmd/kube-proxy:kube-proxy", diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD index 5b0a1debc5f..4697344f302 100644 --- a/build/release-tars/BUILD +++ b/build/release-tars/BUILD @@ -69,7 +69,6 @@ NODE_TARGETS = [ # since we include them in the actual build rule. SERVER_TARGETS = [ "//cmd/hyperkube", - "//vendor/k8s.io/kube-aggregator", "//cmd/kube-apiserver", "//cmd/kube-controller-manager", "//cmd/kube-discovery",