From 453651cbfcac604bcf99b0e1b73cc54141242887 Mon Sep 17 00:00:00 2001 From: deads2k Date: Mon, 9 Jan 2017 11:04:46 -0500 Subject: [PATCH] rename kubernetes-discovery to kube-aggregator --- build/BUILD | 2 +- build/common.sh | 10 ++-- build/debs/BUILD | 4 +- cmd/BUILD | 2 +- cmd/kube-aggregator/BUILD | 58 +++++++++++++++++++ .../artifacts/core-apiservices/legacy.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 .../kubernetes-discover-pod.yaml | 14 ++--- .../kubernetes-discovery-sa.yaml | 2 +- .../kubernetes-discovery-svc.yaml | 6 +- .../artifacts/simple-image/Dockerfile | 4 +- .../config.json | 0 .../hack/build-image.sh | 6 +- .../hack/update-codegen.sh | 18 +++--- .../hack/verify-codegen.sh | 0 .../main.go | 16 ++--- .../pkg/apis/apiregistration/BUILD | 6 +- .../pkg/apis/apiregistration/doc.go | 0 .../pkg/apis/apiregistration/helpers.go | 0 .../pkg/apis/apiregistration/install/BUILD | 4 +- .../apis/apiregistration/install/install.go | 6 +- .../pkg/apis/apiregistration/register.go | 0 .../pkg/apis/apiregistration/types.go | 0 .../pkg/apis/apiregistration/v1alpha1/BUILD | 2 +- .../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 .../pkg/apis/apiregistration/validation/BUILD | 2 +- .../apiregistration/validation/validation.go | 2 +- .../apiregistration/zz_generated.deepcopy.go | 0 .../pkg/apiserver/BUILD | 20 +++---- .../pkg/apiserver/apiserver.go | 14 ++--- .../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_generated/clientset/BUILD | 6 +- .../clientset/clientset.go | 2 +- .../clientset_generated/clientset/doc.go | 2 +- .../clientset_generated/clientset/fake/BUILD | 6 +- .../clientset/fake/clientset_generated.go | 6 +- .../clientset_generated/clientset/fake/doc.go | 2 +- .../typed/apiregistration/v1alpha1/BUILD | 4 +- .../v1alpha1/apiregistration_client.go | 0 .../apiregistration/v1alpha1/apiservice.go | 2 +- .../typed/apiregistration/v1alpha1/doc.go | 2 +- .../typed/apiregistration/v1alpha1/fake/BUILD | 4 +- .../apiregistration/v1alpha1/fake/doc.go | 2 +- .../fake/fake_apiregistration_client.go | 2 +- .../v1alpha1/fake/fake_apiservice.go | 2 +- .../v1alpha1/generated_expansion.go | 0 .../internalclientset/BUILD | 6 +- .../internalclientset/clientset.go | 2 +- .../internalclientset/doc.go | 2 +- .../internalclientset/fake/BUILD | 6 +- .../fake/clientset_generated.go | 6 +- .../internalclientset/fake/doc.go | 2 +- .../apiregistration/internalversion/BUILD | 4 +- .../internalversion/apiregistration_client.go | 0 .../internalversion/apiservice.go | 2 +- .../apiregistration/internalversion/doc.go | 2 +- .../internalversion/fake/BUILD | 4 +- .../internalversion/fake/doc.go | 2 +- .../fake/fake_apiregistration_client.go | 2 +- .../internalversion/fake/fake_apiservice.go | 2 +- .../internalversion/generated_expansion.go | 0 .../pkg/client/informers/BUILD | 45 ++++++++++++++ .../client/informers/apiregistration/BUILD | 10 ++-- .../informers/apiregistration/interface.go | 8 +-- .../apiregistration/internalversion/BUILD | 8 +-- .../internalversion/apiservice.go | 10 ++-- .../internalversion/interface.go | 4 +- .../informers/apiregistration/v1alpha1/BUILD | 8 +-- .../apiregistration/v1alpha1/apiservice.go | 10 ++-- .../apiregistration/v1alpha1/interface.go | 4 +- .../pkg/client/informers/factory.go | 10 ++-- .../pkg/client/informers/generic.go | 6 +- .../client/informers/internalinterfaces/BUILD | 4 +- .../internalinterfaces/internal_interfaces.go | 6 +- .../apiregistration/internalversion/BUILD | 2 +- .../internalversion/apiservice.go | 4 +- .../internalversion/expansion_generated.go | 2 +- .../listers/apiregistration/v1alpha1/BUILD | 4 +- .../apiregistration/v1alpha1/apiservice.go | 6 +- .../v1alpha1/expansion_generated.go | 2 +- .../pkg/cmd/server/BUILD | 6 +- .../pkg/cmd/server/start.go | 8 +-- .../pkg/legacy/BUILD | 4 +- .../pkg/legacy/apis/config/v1alpha1/BUILD | 0 .../pkg/legacy/apis/config/v1alpha1/types.go | 0 .../pkg/legacy/discoverysummarizer.go | 2 +- .../pkg/legacy/doc.go | 2 +- .../pkg/registry/apiservice/BUILD | 6 +- .../pkg/registry/apiservice/etcd/BUILD | 4 +- .../pkg/registry/apiservice/etcd/etcd.go | 4 +- .../pkg/registry/apiservice/strategy.go | 4 +- cmd/kubernetes-discovery/BUILD | 58 ------------------- .../pkg/client/informers/BUILD | 45 -------------- hack/.linted_packages | 16 ++--- hack/lib/golang.sh | 4 +- hack/local-up-cluster.sh | 2 +- hack/local-up-discovery.sh | 22 +++---- hack/update-codegen.sh | 2 +- hack/verify-codegen.sh | 2 +- .../authorizer/rbac/bootstrappolicy/policy.go | 2 +- .../testdata/cluster-roles.yaml | 36 ++++++------ test/integration/discoverysummarizer/BUILD | 2 +- .../discoverysummarizer_test.go | 4 +- test/test_owners.csv | 2 +- 124 files changed, 349 insertions(+), 349 deletions(-) create mode 100644 cmd/kube-aggregator/BUILD rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/legacy.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1.autoscaling.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1.batch.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1beta1.apps.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1beta1.extensions.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1beta1.policy.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/local-cluster-up/etcd-pod.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/local-cluster-up/etcd-svc.yaml (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/local-cluster-up/kubernetes-discover-pod.yaml (92%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml (62%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml (63%) rename cmd/{kubernetes-discovery => kube-aggregator}/artifacts/simple-image/Dockerfile (90%) rename cmd/{kubernetes-discovery => kube-aggregator}/config.json (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/hack/build-image.sh (69%) rename cmd/{kubernetes-discovery => kube-aggregator}/hack/update-codegen.sh (62%) rename cmd/{kubernetes-discovery => kube-aggregator}/hack/verify-codegen.sh (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/main.go (60%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/BUILD (77%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/doc.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/helpers.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/install/BUILD (77%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/install/install.go (82%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/register.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/types.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/BUILD (92%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/doc.go (88%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/register.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/types.generated.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/types.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/validation/BUILD (89%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/validation/validation.go (97%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apis/apiregistration/zz_generated.deepcopy.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/BUILD (75%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/apiserver.go (94%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/apiservice_controller.go (93%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/handler_apis.go (94%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/handler_apis_test.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/handler_proxy.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/apiserver/handler_proxy_test.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/BUILD (70%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/clientset.go (95%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/doc.go (83%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/fake/BUILD (71%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/fake/clientset_generated.go (86%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/fake/doc.go (83%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD (82%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go (83%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD (81%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go (83%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go (89%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go (97%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/BUILD (68%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/clientset.go (94%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/doc.go (80%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/fake/BUILD (70%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go (83%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/fake/doc.go (80%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD (79%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go (80%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD (80%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go (79%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go (87%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go (97%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go (100%) create mode 100644 cmd/kube-aggregator/pkg/client/informers/BUILD rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/BUILD (50%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/interface.go (63%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/internalversion/BUILD (65%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/internalversion/apiservice.go (71%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/internalversion/interface.go (64%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/v1alpha1/BUILD (64%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/v1alpha1/apiservice.go (68%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/apiregistration/v1alpha1/interface.go (64%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/factory.go (77%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/generic.go (75%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/internalinterfaces/BUILD (74%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/informers/internalinterfaces/internal_interfaces.go (63%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/listers/apiregistration/internalversion/BUILD (89%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/listers/apiregistration/internalversion/apiservice.go (86%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/listers/apiregistration/internalversion/expansion_generated.go (76%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/listers/apiregistration/v1alpha1/BUILD (80%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/listers/apiregistration/v1alpha1/apiservice.go (83%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go (76%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/cmd/server/BUILD (84%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/cmd/server/start.go (95%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/legacy/BUILD (78%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/legacy/apis/config/v1alpha1/BUILD (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/legacy/apis/config/v1alpha1/types.go (100%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/legacy/discoverysummarizer.go (98%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/legacy/doc.go (91%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/registry/apiservice/BUILD (78%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/registry/apiservice/etcd/BUILD (80%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/registry/apiservice/etcd/etcd.go (92%) rename cmd/{kubernetes-discovery => kube-aggregator}/pkg/registry/apiservice/strategy.go (95%) delete mode 100644 cmd/kubernetes-discovery/BUILD delete mode 100644 cmd/kubernetes-discovery/pkg/client/informers/BUILD diff --git a/build/BUILD b/build/BUILD index 50bf44e991c..0803af5f50b 100644 --- a/build/BUILD +++ b/build/BUILD @@ -46,7 +46,7 @@ docker_build( "kube-apiserver", "kube-controller-manager", "kube-scheduler", - "kubernetes-discovery", + "kube-aggregator", ]] docker_build( diff --git a/build/common.sh b/build/common.sh index 626afae286f..b31421edff8 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,7 +97,7 @@ kube::build::get_docker_wrapped_binaries() { kube-apiserver,busybox kube-controller-manager,busybox kube-scheduler,busybox - kubernetes-discovery,busybox + kube-aggregator,busybox kube-proxy,gcr.io/google_containers/debian-iptables-amd64:v4 );; "arm") @@ -105,7 +105,7 @@ kube::build::get_docker_wrapped_binaries() { kube-apiserver,armel/busybox kube-controller-manager,armel/busybox kube-scheduler,armel/busybox - kubernetes-discovery,armel/busybox + kube-aggregator,armel/busybox kube-proxy,gcr.io/google_containers/debian-iptables-arm:v4 );; "arm64") @@ -113,7 +113,7 @@ kube::build::get_docker_wrapped_binaries() { kube-apiserver,aarch64/busybox kube-controller-manager,aarch64/busybox kube-scheduler,aarch64/busybox - kubernetes-discovery,aarch64/busybox + kube-aggregator,aarch64/busybox kube-proxy,gcr.io/google_containers/debian-iptables-arm64:v4 );; "ppc64le") @@ -121,7 +121,7 @@ kube::build::get_docker_wrapped_binaries() { kube-apiserver,ppc64le/busybox kube-controller-manager,ppc64le/busybox kube-scheduler,ppc64le/busybox - kubernetes-discovery,ppc64le/busybox + kube-aggregator,ppc64le/busybox kube-proxy,gcr.io/google_containers/debian-iptables-ppc64le:v4 );; "s390x") @@ -129,7 +129,7 @@ kube::build::get_docker_wrapped_binaries() { kube-apiserver,s390x/busybox kube-controller-manager,s390x/busybox kube-scheduler,s390x/busybox - kubernetes-discovery,s390x/busybox + kube-aggregator,s390x/busybox kube-proxy,gcr.io/google_containers/debian-iptables-s390x:v4 );; esac diff --git a/build/debs/BUILD b/build/debs/BUILD index 1b2cb06189a..9b0a5161b3d 100644 --- a/build/debs/BUILD +++ b/build/debs/BUILD @@ -32,7 +32,7 @@ filegroup( "kube-apiserver", "kube-controller-manager", "kube-proxy", - "kubernetes-discovery", + "kube-aggregator", ]] deb_data( @@ -116,7 +116,7 @@ k8s_deb( ) k8s_deb( - name = "kubernetes-discovery", + name = "kube-aggregator", description = "Kubernetes Federated API Server", ) diff --git a/cmd/BUILD b/cmd/BUILD index 6aad0ddece2..c1cef9f5864 100644 --- a/cmd/BUILD +++ b/cmd/BUILD @@ -23,6 +23,7 @@ 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", @@ -31,7 +32,6 @@ filegroup( "//cmd/kubectl:all-srcs", "//cmd/kubelet:all-srcs", "//cmd/kubemark:all-srcs", - "//cmd/kubernetes-discovery:all-srcs", "//cmd/libs/go2idl/client-gen:all-srcs", "//cmd/libs/go2idl/conversion-gen:all-srcs", "//cmd/libs/go2idl/deepcopy-gen:all-srcs", diff --git a/cmd/kube-aggregator/BUILD b/cmd/kube-aggregator/BUILD new file mode 100644 index 00000000000..eaed11ac9d9 --- /dev/null +++ b/cmd/kube-aggregator/BUILD @@ -0,0 +1,58 @@ +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/informers/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1: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", + "//pkg/kubectl/cmd/util:go_default_library", + "//pkg/util/logs: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/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: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/legacy: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/kubernetes-discovery/artifacts/core-apiservices/legacy.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/legacy.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/legacy.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/legacy.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1.autoscaling.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1.autoscaling.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1.autoscaling.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1.batch.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1.batch.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1.batch.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.certificates.k8s.io.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1alpha1.rbac.authorization.k8s.io.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.apps.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.apps.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.apps.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authentication.k8s.io.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.authorization.k8s.io.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.extensions.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.extensions.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.extensions.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.policy.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.policy.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.policy.yaml diff --git a/cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml b/cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml rename to cmd/kube-aggregator/artifacts/core-apiservices/v1beta1.storage.k8s.io.yaml diff --git a/cmd/kubernetes-discovery/artifacts/local-cluster-up/etcd-pod.yaml b/cmd/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/local-cluster-up/etcd-pod.yaml rename to cmd/kube-aggregator/artifacts/local-cluster-up/etcd-pod.yaml diff --git a/cmd/kubernetes-discovery/artifacts/local-cluster-up/etcd-svc.yaml b/cmd/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml similarity index 100% rename from cmd/kubernetes-discovery/artifacts/local-cluster-up/etcd-svc.yaml rename to cmd/kube-aggregator/artifacts/local-cluster-up/etcd-svc.yaml diff --git a/cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discover-pod.yaml b/cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discover-pod.yaml similarity index 92% rename from cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discover-pod.yaml rename to cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discover-pod.yaml index fe4d84dd5f7..a67f06b8995 100644 --- a/cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discover-pod.yaml +++ b/cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discover-pod.yaml @@ -1,21 +1,21 @@ kind: ReplicationController apiVersion: v1 metadata: - name: kubernetes-discovery + name: kube-aggregator labels: - kubernetes-discovery: "true" + kube-aggregator: "true" spec: replicas: 1 selector: - kubernetes-discovery: "true" + kube-aggregator: "true" template: metadata: labels: - kubernetes-discovery: "true" + kube-aggregator: "true" spec: containers: - - name: kubernetes-discovery - image: kubernetes-discovery:latest + - name: kube-aggregator + image: kube-aggregator:latest imagePullPolicy: Never livenessProbe: failureThreshold: 3 @@ -67,7 +67,7 @@ spec: name: volume-serving-cert - mountPath: /var/run/etcd-ca name: volume-etcd-ca - serviceAccountName: kubernetes-discovery + serviceAccountName: kube-aggregator volumes: - configMap: defaultMode: 420 diff --git a/cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml b/cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml similarity index 62% rename from cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml rename to cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml index 9dbe72ffe29..927dfad2ec9 100644 --- a/cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml +++ b/cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml @@ -1,4 +1,4 @@ kind: ServiceAccount apiVersion: v1 metadata: - name: kubernetes-discovery \ No newline at end of file + name: kube-aggregator \ No newline at end of file diff --git a/cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml b/cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml similarity index 63% rename from cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml rename to cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml index 669888c0982..aaacbd8fcea 100644 --- a/cmd/kubernetes-discovery/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml +++ b/cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-svc.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: Service metadata: labels: - kubernetes-discovery: "true" - name: kubernetes-discovery + kube-aggregator: "true" + name: kube-aggregator spec: ports: - port: 443 @@ -11,5 +11,5 @@ spec: nodePort: 31090 targetPort: 443 selector: - kubernetes-discovery: "true" + kube-aggregator: "true" type: NodePort diff --git a/cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile b/cmd/kube-aggregator/artifacts/simple-image/Dockerfile similarity index 90% rename from cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile rename to cmd/kube-aggregator/artifacts/simple-image/Dockerfile index fb1ce03a07f..19178c6f963 100644 --- a/cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile +++ b/cmd/kube-aggregator/artifacts/simple-image/Dockerfile @@ -13,5 +13,5 @@ # limitations under the License. FROM fedora -ADD kubernetes-discovery / -ENTRYPOINT ["/kubernetes-discovery"] +ADD kube-aggregator / +ENTRYPOINT ["/kube-aggregator"] diff --git a/cmd/kubernetes-discovery/config.json b/cmd/kube-aggregator/config.json similarity index 100% rename from cmd/kubernetes-discovery/config.json rename to cmd/kube-aggregator/config.json diff --git a/cmd/kubernetes-discovery/hack/build-image.sh b/cmd/kube-aggregator/hack/build-image.sh similarity index 69% rename from cmd/kubernetes-discovery/hack/build-image.sh rename to cmd/kube-aggregator/hack/build-image.sh index f9f5809836f..c753eee9bba 100755 --- a/cmd/kubernetes-discovery/hack/build-image.sh +++ b/cmd/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/kubernetes-discovery/artifacts/simple-image/kubernetes-discovery" + rm "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image/kube-aggregator" } trap cleanup EXIT -cp -v ${KUBE_ROOT}/_output/local/bin/linux/amd64/kubernetes-discovery "${KUBE_ROOT}/cmd/kubernetes-discovery/artifacts/simple-image/kubernetes-discovery" -docker build -t kubernetes-discovery:latest ${KUBE_ROOT}/cmd/kubernetes-discovery/artifacts/simple-image +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 diff --git a/cmd/kubernetes-discovery/hack/update-codegen.sh b/cmd/kube-aggregator/hack/update-codegen.sh similarity index 62% rename from cmd/kubernetes-discovery/hack/update-codegen.sh rename to cmd/kube-aggregator/hack/update-codegen.sh index d58d2002ab8..0c34232190f 100755 --- a/cmd/kubernetes-discovery/hack/update-codegen.sh +++ b/cmd/kube-aggregator/hack/update-codegen.sh @@ -34,14 +34,14 @@ echo "Building client-gen" CLIENTGEN="${PWD}/client-gen-binary" go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen -PREFIX=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +PREFIX=k8s.io/kubernetes/cmd/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/kubernetes-discovery/pkg/client/clientset_generated" +CLIENTSET_PATH="--clientset-path k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated" ${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} @@ -51,8 +51,8 @@ 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/kubernetes-discovery/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" -LISTER_PATH="--output-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers" +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} @@ -61,9 +61,9 @@ informergen="${PWD}/informer-gen" go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen ${informergen} \ - --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1 \ - --versioned-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset \ - --internal-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset \ - --listers-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers \ - --output-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers + --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 "$@" diff --git a/cmd/kubernetes-discovery/hack/verify-codegen.sh b/cmd/kube-aggregator/hack/verify-codegen.sh similarity index 100% rename from cmd/kubernetes-discovery/hack/verify-codegen.sh rename to cmd/kube-aggregator/hack/verify-codegen.sh diff --git a/cmd/kubernetes-discovery/main.go b/cmd/kube-aggregator/main.go similarity index 60% rename from cmd/kubernetes-discovery/main.go rename to cmd/kube-aggregator/main.go index 0e5915f794e..8a70a8331c7 100644 --- a/cmd/kubernetes-discovery/main.go +++ b/cmd/kube-aggregator/main.go @@ -21,18 +21,18 @@ import ( "os" "runtime" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/cmd/server" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/cmd/server" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util/logs" // force compilation of packages we'll later rely upon - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/install" - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation" - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion" - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1" - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" - _ "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1" + _ "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/informers/apiregistration/internalversion" + _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1" + _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + _ "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" ) func main() { diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD similarity index 77% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/BUILD rename to cmd/kube-aggregator/pkg/apis/apiregistration/BUILD index 10ba46604dd..defc2e56bf5 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD @@ -37,9 +37,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/install:all-srcs", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:all-srcs", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/validation:all-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/kubernetes-discovery/pkg/apis/apiregistration/doc.go b/cmd/kube-aggregator/pkg/apis/apiregistration/doc.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/doc.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/doc.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/helpers.go b/cmd/kube-aggregator/pkg/apis/apiregistration/helpers.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/helpers.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/helpers.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/install/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD similarity index 77% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/install/BUILD rename to cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD index e481e93fbfd..30fe8a312b5 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/install/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/util/sets:go_default_library", ], diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/install/install.go b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go similarity index 82% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/install/install.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go index 27c80a42bee..574e8d6b001 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/install/install.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go @@ -17,8 +17,8 @@ limitations under the License. package install import ( - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/util/sets" ) @@ -29,7 +29,7 @@ func init() { GroupName: apiregistration.GroupName, RootScopedKinds: sets.NewString("APIService"), VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration", + ImportPrefix: "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration", AddInternalObjectsToScheme: apiregistration.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/register.go b/cmd/kube-aggregator/pkg/apis/apiregistration/register.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/register.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/register.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/types.go b/cmd/kube-aggregator/pkg/apis/apiregistration/types.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/types.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/types.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD similarity index 92% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/BUILD rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD index 0748b659d2b..3b891b7b9bf 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/BUILD @@ -19,7 +19,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/doc.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go similarity index 88% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/doc.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go index 7381304c2ef..f1ed61aa8f2 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/doc.go +++ b/cmd/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/kubernetes-discovery/pkg/apis/apiregistration +// +k8s:conversion-gen=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration // Package v1alpha1 is the v1alpha1 version of the API. // +groupName=apiregistration.k8s.io diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/register.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/register.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/types.generated.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/types.generated.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/types.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/types.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go index bc82c9c387d..3b1f0a60bca 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" unsafe "unsafe" diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD similarity index 89% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/validation/BUILD rename to cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD index 114ea603991..e23c1ca4dde 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD @@ -12,7 +12,7 @@ go_library( srcs = ["validation.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/util/validation:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation/validation.go b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go similarity index 97% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/validation/validation.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go index 60e441959bd..cd63d355e11 100644 --- a/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation/validation.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go @@ -24,7 +24,7 @@ import ( utilvalidation "k8s.io/kubernetes/pkg/util/validation" "k8s.io/kubernetes/pkg/util/validation/field" - discoveryapi "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + discoveryapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) func ValidateAPIService(apiServer *discoveryapi.APIService) field.ErrorList { diff --git a/cmd/kubernetes-discovery/pkg/apis/apiregistration/zz_generated.deepcopy.go b/cmd/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/apis/apiregistration/zz_generated.deepcopy.go rename to cmd/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go diff --git a/cmd/kubernetes-discovery/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD similarity index 75% rename from cmd/kubernetes-discovery/pkg/apiserver/BUILD rename to cmd/kube-aggregator/pkg/apiserver/BUILD index 8f8fe61dd9f..a943fc6a6cd 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -18,14 +18,14 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library", - "//cmd/kubernetes-discovery/pkg/registry/apiservice/etcd:go_default_library", + "//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/clientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", @@ -65,8 +65,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go similarity index 94% rename from cmd/kubernetes-discovery/pkg/apiserver/apiserver.go rename to cmd/kube-aggregator/pkg/apiserver/apiserver.go index 7ce2737231c..e8c1cf639d7 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -34,13 +34,13 @@ import ( "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" - discoveryclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers" - listers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" - apiservicestorage "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + discoveryclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers" + listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" + apiservicestorage "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice/etcd" ) // legacyAPIServiceName is the fixed name of the only non-groupified API version diff --git a/cmd/kubernetes-discovery/pkg/apiserver/apiservice_controller.go b/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go similarity index 93% rename from cmd/kubernetes-discovery/pkg/apiserver/apiservice_controller.go rename to cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go index 9e8f5eeaeb2..7a1afd76349 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/apiservice_controller.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/workqueue" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - informers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion" - listers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion" + listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) type APIHandlerManager interface { diff --git a/cmd/kubernetes-discovery/pkg/apiserver/handler_apis.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go similarity index 94% rename from cmd/kubernetes-discovery/pkg/apiserver/handler_apis.go rename to cmd/kube-aggregator/pkg/apiserver/handler_apis.go index 231e6b763c9..1b2c674b6f0 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/handler_apis.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go @@ -28,10 +28,10 @@ import ( "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" - apiregistrationapi "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" - informers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion" - listers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" + 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/apiregistration/internalversion" + listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) // WithAPIs adds the handling for /apis and /apis/. diff --git a/cmd/kubernetes-discovery/pkg/apiserver/handler_apis_test.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/apiserver/handler_apis_test.go rename to cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go index 28b91c8d497..53293a5cbca 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/handler_apis_test.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/diff" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - listers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" ) type delegationHTTPHandler struct { diff --git a/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/apiserver/handler_proxy.go rename to cmd/kube-aggregator/pkg/apiserver/handler_proxy.go index 6db2afe601d..398e068a972 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/httpstream/spdy" - apiregistrationapi "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) // proxyHandler provides a http.Handler which will proxy traffic to locations diff --git a/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go rename to cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go index 247f40efe59..89892023005 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go @@ -30,7 +30,7 @@ import ( genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/sets" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) type targetHTTPHandler struct { diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD similarity index 70% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD index 869692e5a82..bde00c5780e 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD @@ -15,7 +15,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/util/flowcontrol:go_default_library", @@ -35,8 +35,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:all-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/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go similarity index 95% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index 1af76594a35..46de81603ca 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -18,7 +18,7 @@ package clientset import ( "github.com/golang/glog" - v1alpha1apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go similarity index 83% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go index 6820742990c..e63fc840ddc 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // This package has the automatically generated clientset. package clientset diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD similarity index 71% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD index a0318d93ab2..3e877ae5bb8 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD @@ -15,9 +15,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:go_default_library", "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go similarity index 86% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/clientset_generated.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index 9c271c642f1..db0280fdefd 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -17,9 +17,9 @@ limitations under the License. package fake import ( - clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" - v1alpha1apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" - fakev1alpha1apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" + clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" + v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + fakev1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go similarity index 83% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go index 20883c9f5c6..3d9bd7727b4 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // This package has the automatically generated fake clientset. package fake diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD similarity index 82% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD index d3b3d5cc740..61547ea7159 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD @@ -17,7 +17,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", @@ -40,7 +40,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:all-srcs", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go index dbbdf6d39b2..4eaee958e88 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go similarity index 83% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go index 10f2eaf36ff..2fe7dfba201 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // This package has the automatically generated typed clients. package v1alpha1 diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD similarity index 81% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD index c998888711c..e8c00a6a46e 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD @@ -16,8 +16,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go similarity index 83% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go index 8feee41620b..ec1b15620d8 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // Package fake has the automatically generated clients. package fake diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go similarity index 89% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go index b33cea88d05..d4a242fbf92 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go similarity index 97% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go index 1beece0477a..8f1f1c591a7 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD similarity index 68% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD index 64933f21477..a59b5d53c36 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD @@ -15,7 +15,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/util/flowcontrol:go_default_library", @@ -35,8 +35,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:all-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/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go similarity index 94% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/clientset.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index 90bfb933f8c..12175032fdf 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -18,7 +18,7 @@ package internalclientset import ( "github.com/golang/glog" - internalversionapiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go similarity index 80% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go index 406fcc7d77a..7e336425cb6 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // This package has the automatically generated clientset. package internalclientset diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD similarity index 70% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD index c9864bd59f0..b14dea15d80 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD @@ -15,9 +15,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:go_default_library", "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go similarity index 83% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index 5e018313b3d..9b44346c006 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -17,9 +17,9 @@ limitations under the License. package fake import ( - clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - internalversionapiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" - fakeinternalversionapiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" + clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" + internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + fakeinternalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go similarity index 80% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go index 1057590d569..63cb12bd719 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/fake/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // This package has the automatically generated fake clientset. package fake diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD similarity index 79% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD index 240bfc90afb..61b128d21ce 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD @@ -17,7 +17,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/meta/v1:go_default_library", @@ -37,7 +37,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:all-srcs", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go index 1748f5b177d..20e85d97285 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/apis/meta/v1" restclient "k8s.io/kubernetes/pkg/client/restclient" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go similarity index 80% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go index ee1bd2bc8af..47ad2ff15cc 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // This package has the automatically generated typed clients. package internalversion diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD similarity index 80% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD index eec3f2e728c..a6b4d91a461 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD @@ -16,8 +16,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go similarity index 79% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go index aa1aeb9757f..bc717c75b52 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-path=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated --input=[apiregistration/] --input-base=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis // Package fake has the automatically generated clients. package fake diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go similarity index 87% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go index 1568b2d9ada..887fb550a92 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - internalversion "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go similarity index 97% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go index 0c12d6dac05..0707f7815c1 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/apis/meta/v1" core "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go rename to cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/generated_expansion.go diff --git a/cmd/kube-aggregator/pkg/client/informers/BUILD b/cmd/kube-aggregator/pkg/client/informers/BUILD new file mode 100644 index 00000000000..a1f9fb12d0e --- /dev/null +++ b/cmd/kube-aggregator/pkg/client/informers/BUILD @@ -0,0 +1,45 @@ +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/apis/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:go_default_library", + "//pkg/client/cache:go_default_library", + "//pkg/runtime:go_default_library", + "//pkg/runtime/schema: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/apiregistration:all-srcs", + "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:all-srcs", + ], + tags = ["automanaged"], +) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD b/cmd/kube-aggregator/pkg/client/informers/apiregistration/BUILD similarity index 50% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/BUILD index be03a5f208e..332e6d22a63 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/BUILD +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/BUILD @@ -12,9 +12,9 @@ go_library( srcs = ["interface.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/client/informers/internalinterfaces:go_default_library", ], ) @@ -29,8 +29,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1:all-srcs", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:all-srcs", + "//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/interface.go similarity index 63% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/interface.go index 50c03781f63..13ae497dd7c 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/interface.go +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/interface.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package apiregistration import ( - internalversion "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion" - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1" - internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" + internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1" + internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/BUILD similarity index 65% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/BUILD index b279edd0b3d..062f02adfae 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/BUILD +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/BUILD @@ -15,10 +15,10 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library", + "//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/internalinterfaces:go_default_library", + "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go similarity index 71% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go index 2fa4d9c3ce1..b3b6ad3cc7c 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/apiservice.go @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package internalversion import ( - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" - internalversion "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" + 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/internalinterfaces" + internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/interface.go similarity index 64% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/interface.go index 717c4811482..a05d3af12b2 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion/interface.go +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion/interface.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package internalversion import ( - internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" + internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/BUILD similarity index 64% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/BUILD index 505e1d9516e..006bc0fa667 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/BUILD +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/BUILD @@ -15,10 +15,10 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1:go_default_library", + "//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/internalinterfaces:go_default_library", + "//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/runtime:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go similarity index 68% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go index 804bb8d6c0c..0a9a9e01326 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/apiservice.go @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package v1alpha1 import ( - apiregistration_v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" - clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" - internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1" + 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/internalinterfaces" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" runtime "k8s.io/kubernetes/pkg/runtime" diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/interface.go similarity index 64% rename from cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go rename to cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/interface.go index ad041a36551..8ea17d5fa00 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/interface.go +++ b/cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1/interface.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package v1alpha1 import ( - internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" + internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cmd/kubernetes-discovery/pkg/client/informers/factory.go b/cmd/kube-aggregator/pkg/client/informers/factory.go similarity index 77% rename from cmd/kubernetes-discovery/pkg/client/informers/factory.go rename to cmd/kube-aggregator/pkg/client/informers/factory.go index 02496cc3241..a1ac46b12b9 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/factory.go +++ b/cmd/kube-aggregator/pkg/client/informers/factory.go @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package informers import ( - clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" - internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration" - internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" + clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" + internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/apiregistration" + internalinterfaces "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalinterfaces" cache "k8s.io/kubernetes/pkg/client/cache" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" diff --git a/cmd/kubernetes-discovery/pkg/client/informers/generic.go b/cmd/kube-aggregator/pkg/client/informers/generic.go similarity index 75% rename from cmd/kubernetes-discovery/pkg/client/informers/generic.go rename to cmd/kube-aggregator/pkg/client/informers/generic.go index 15d0ffb1b8d..8a654502b26 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/generic.go +++ b/cmd/kube-aggregator/pkg/client/informers/generic.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package informers import ( "fmt" - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" cache "k8s.io/kubernetes/pkg/client/cache" schema "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD b/cmd/kube-aggregator/pkg/client/informers/internalinterfaces/BUILD similarity index 74% rename from cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD rename to cmd/kube-aggregator/pkg/client/informers/internalinterfaces/BUILD index 0ff4a467d2f..1e01f39fa8f 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD +++ b/cmd/kube-aggregator/pkg/client/informers/internalinterfaces/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["internal_interfaces.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", + "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/runtime:go_default_library", ], diff --git a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go b/cmd/kube-aggregator/pkg/client/informers/internalinterfaces/internal_interfaces.go similarity index 63% rename from cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go rename to cmd/kube-aggregator/pkg/client/informers/internalinterfaces/internal_interfaces.go index 6adab0047d9..40fec1c2db2 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go +++ b/cmd/kube-aggregator/pkg/client/informers/internalinterfaces/internal_interfaces.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --internal-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers --versioned-clientset-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --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 --versioned-clientset-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset package internalinterfaces import ( - clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" - internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" + clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" + internalclientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" cache "k8s.io/kubernetes/pkg/client/cache" runtime "k8s.io/kubernetes/pkg/runtime" time "time" diff --git a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD similarity index 89% rename from cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/BUILD rename to cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD index d43aa672819..5b362c2f81f 100644 --- a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/BUILD +++ b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/BUILD @@ -15,7 +15,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go similarity index 86% rename from cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/apiservice.go rename to cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go index d70d56d1983..1e2eb2ed660 100644 --- a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers package internalversion import ( - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" diff --git a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/expansion_generated.go b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go similarity index 76% rename from cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/expansion_generated.go rename to cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go index 0c1fbe0ed90..0e2473f5bd1 100644 --- a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion/expansion_generated.go +++ b/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers package internalversion diff --git a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD similarity index 80% rename from cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/BUILD rename to cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD index 8e360bd1bcd..be8e4bbc3ff 100644 --- a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/BUILD +++ b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/BUILD @@ -15,8 +15,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go similarity index 83% rename from cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/apiservice.go rename to cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go index 4abdd4a7f4a..ac257dc6dc1 100644 --- a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/apiservice.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers package v1alpha1 import ( - apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" + apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" diff --git a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go similarity index 76% rename from cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go rename to cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go index ae3abef96ca..adf846ce66f 100644 --- a/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go +++ b/cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration,k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1] --output-package=k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers package v1alpha1 diff --git a/cmd/kubernetes-discovery/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD similarity index 84% rename from cmd/kubernetes-discovery/pkg/cmd/server/BUILD rename to cmd/kube-aggregator/pkg/cmd/server/BUILD index 43de42b33aa..4fe2992ecda 100644 --- a/cmd/kubernetes-discovery/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -12,9 +12,9 @@ go_library( srcs = ["start.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/apiserver:go_default_library", - "//cmd/kubernetes-discovery/pkg/legacy:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/apiserver:go_default_library", + "//cmd/kube-aggregator/pkg/legacy:go_default_library", "//pkg/api:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go similarity index 95% rename from cmd/kubernetes-discovery/pkg/cmd/server/start.go rename to cmd/kube-aggregator/pkg/cmd/server/start.go index de0b7b09794..77b43f5ebfc 100644 --- a/cmd/kubernetes-discovery/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -24,8 +24,8 @@ import ( "github.com/pborman/uuid" "github.com/spf13/cobra" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apiserver" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/legacy" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy" "k8s.io/kubernetes/pkg/api" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -40,10 +40,10 @@ import ( "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/wait" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) -const defaultEtcdPathPrefix = "/registry/kubernetes.io/kubernetes-discovery" +const defaultEtcdPathPrefix = "/registry/kubernetes.io/kube-aggregator" type DiscoveryServerOptions struct { Etcd *genericoptions.EtcdOptions diff --git a/cmd/kubernetes-discovery/pkg/legacy/BUILD b/cmd/kube-aggregator/pkg/legacy/BUILD similarity index 78% rename from cmd/kubernetes-discovery/pkg/legacy/BUILD rename to cmd/kube-aggregator/pkg/legacy/BUILD index fd260c32cfd..ae94c2926f9 100644 --- a/cmd/kubernetes-discovery/pkg/legacy/BUILD +++ b/cmd/kube-aggregator/pkg/legacy/BUILD @@ -15,7 +15,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1:go_default_library", + "//cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1:go_default_library", "//pkg/apis/meta/v1:go_default_library", ], ) @@ -31,7 +31,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1:all-srcs", + "//cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1/BUILD similarity index 100% rename from cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1/BUILD rename to cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1/BUILD diff --git a/cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1/types.go b/cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1/types.go similarity index 100% rename from cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1/types.go rename to cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1/types.go diff --git a/cmd/kubernetes-discovery/pkg/legacy/discoverysummarizer.go b/cmd/kube-aggregator/pkg/legacy/discoverysummarizer.go similarity index 98% rename from cmd/kubernetes-discovery/pkg/legacy/discoverysummarizer.go rename to cmd/kube-aggregator/pkg/legacy/discoverysummarizer.go index 632e98a87d4..8fc9dda2634 100644 --- a/cmd/kubernetes-discovery/pkg/legacy/discoverysummarizer.go +++ b/cmd/kube-aggregator/pkg/legacy/discoverysummarizer.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "net/http" - config "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/legacy/apis/config/v1alpha1" + config "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy/apis/config/v1alpha1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) diff --git a/cmd/kubernetes-discovery/pkg/legacy/doc.go b/cmd/kube-aggregator/pkg/legacy/doc.go similarity index 91% rename from cmd/kubernetes-discovery/pkg/legacy/doc.go rename to cmd/kube-aggregator/pkg/legacy/doc.go index 589bfeb0851..05e32ba6649 100644 --- a/cmd/kubernetes-discovery/pkg/legacy/doc.go +++ b/cmd/kube-aggregator/pkg/legacy/doc.go @@ -17,4 +17,4 @@ limitations under the License. // Package discoverysummarizer contains code for the legacy discovery summarizer // (program to summarize discovery information from all federated api servers) // as per https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/federated-api-servers.md -package legacy // import "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/legacy" +package legacy // import "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy" diff --git a/cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD similarity index 78% rename from cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD rename to cmd/kube-aggregator/pkg/registry/apiservice/BUILD index 6fc9af38618..eeeba4365a8 100644 --- a/cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["strategy.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/validation:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", @@ -36,7 +36,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubernetes-discovery/pkg/registry/apiservice/etcd:all-srcs", + "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD similarity index 80% rename from cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/BUILD rename to cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD index db59cd9e573..6f8b3a3e0d3 100644 --- a/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["etcd.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/registry/apiservice:go_default_library", + "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//cmd/kube-aggregator/pkg/registry/apiservice:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/runtime:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/etcd.go b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go similarity index 92% rename from cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/etcd.go rename to cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go index 2bbb96f5401..89e6e54bb7f 100644 --- a/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/etcd.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go @@ -17,8 +17,8 @@ limitations under the License. package etcd import ( - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/registry/apiservice" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/cmd/kubernetes-discovery/pkg/registry/apiservice/strategy.go b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go similarity index 95% rename from cmd/kubernetes-discovery/pkg/registry/apiservice/strategy.go rename to cmd/kube-aggregator/pkg/registry/apiservice/strategy.go index 423c1238578..89ec975efa4 100644 --- a/cmd/kubernetes-discovery/pkg/registry/apiservice/strategy.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go @@ -28,8 +28,8 @@ import ( "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/util/validation/field" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/validation" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/validation" ) type apiServerStrategy struct { diff --git a/cmd/kubernetes-discovery/BUILD b/cmd/kubernetes-discovery/BUILD deleted file mode 100644 index 81bc1515e15..00000000000 --- a/cmd/kubernetes-discovery/BUILD +++ /dev/null @@ -1,58 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_binary", - "go_library", -) - -go_binary( - name = "kubernetes-discovery", - library = ":go_default_library", - tags = ["automanaged"], -) - -go_library( - name = "go_default_library", - srcs = ["main.go"], - tags = ["automanaged"], - deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/install:go_default_library", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/validation:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/cmd/server:go_default_library", - "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/util/logs:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:all-srcs", - "//cmd/kubernetes-discovery/pkg/apiserver:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/informers:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1:all-srcs", - "//cmd/kubernetes-discovery/pkg/cmd/server:all-srcs", - "//cmd/kubernetes-discovery/pkg/legacy:all-srcs", - "//cmd/kubernetes-discovery/pkg/registry/apiservice:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/cmd/kubernetes-discovery/pkg/client/informers/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/BUILD deleted file mode 100644 index 3e629f21cab..00000000000 --- a/cmd/kubernetes-discovery/pkg/client/informers/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 = [ - "factory.go", - "generic.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library", - "//pkg/client/cache:go_default_library", - "//pkg/runtime:go_default_library", - "//pkg/runtime/schema:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration:all-srcs", - "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/hack/.linted_packages b/hack/.linted_packages index 4bbe2bac595..da6b2af46ff 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -9,6 +9,14 @@ cmd/genman cmd/genswaggertypedocs cmd/genyaml cmd/integration +cmd/kube-aggregator +cmd/kube-aggregator/pkg/apis/apiregistration/install +cmd/kube-aggregator/pkg/client/informers +cmd/kube-aggregator/pkg/client/informers/apiregistration +cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion +cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1 +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 @@ -21,14 +29,6 @@ cmd/kubeadm cmd/kubeadm/app/apis/kubeadm/install cmd/kubectl cmd/kubelet -cmd/kubernetes-discovery -cmd/kubernetes-discovery/pkg/apis/apiregistration/install -cmd/kubernetes-discovery/pkg/client/informers -cmd/kubernetes-discovery/pkg/client/informers/apiregistration -cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion -cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1 -cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion -cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1 cmd/libs/go2idl/client-gen cmd/libs/go2idl/client-gen/generators cmd/libs/go2idl/client-gen/test_apis/testgroup/install diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 0c695100144..eefdc9ba211 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -30,7 +30,7 @@ kube::golang::server_targets() { cmd/kubeadm cmd/hyperkube cmd/kube-discovery - cmd/kubernetes-discovery + cmd/kube-aggregator plugin/cmd/kube-scheduler ) echo "${targets[@]}" @@ -191,7 +191,7 @@ readonly KUBE_STATIC_LIBRARIES=( kube-scheduler kube-proxy kube-discovery - kubernetes-discovery + kube-aggregator kubeadm kubectl ) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 92b13eab89c..4e26cc744d2 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -138,7 +138,7 @@ do done if [ "x$GO_OUT" == "x" ]; then - make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube cmd/kubernetes-discovery" + make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube cmd/kube-aggregator" else echo "skipped the build." fi diff --git a/hack/local-up-discovery.sh b/hack/local-up-discovery.sh index 6a280081966..e4b48d15fc1 100755 --- a/hack/local-up-discovery.sh +++ b/hack/local-up-discovery.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# starts kubernetes-discovery as a pod after you've run `local-up-cluster.sh` +# starts kube-aggregator as a pod after you've run `local-up-cluster.sh` KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. @@ -59,14 +59,14 @@ function start_discovery { # grant permission to run delegated authentication and authorization checks kubectl_core delete clusterrolebinding discovery:system:auth-delegator > /dev/null 2>&1 || true - kubectl_core delete clusterrolebinding discovery:system:kubernetes-discovery > /dev/null 2>&1 || true - kubectl_core create clusterrolebinding discovery:system:auth-delegator --clusterrole=system:auth-delegator --serviceaccount=kube-public:kubernetes-discovery - kubectl_core create clusterrolebinding discovery:system:kubernetes-discovery --clusterrole=system:kubernetes-discovery --serviceaccount=kube-public:kubernetes-discovery + kubectl_core delete clusterrolebinding discovery:system:kube-aggregator > /dev/null 2>&1 || true + kubectl_core create clusterrolebinding discovery:system:auth-delegator --clusterrole=system:auth-delegator --serviceaccount=kube-public:kube-aggregator + kubectl_core create clusterrolebinding discovery:system:kube-aggregator --clusterrole=system:kube-aggregator --serviceaccount=kube-public: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-discovery discovery-etcd > /dev/null 2>&1 || true kubectl_core -n kube-public delete configmap etcd-ca discovery-ca client-ca request-header-ca > /dev/null 2>&1 || true - kubectl_core -n kube-public delete -f "${KUBE_ROOT}/cmd/kubernetes-discovery/artifacts/local-cluster-up" > /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 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,24 +77,24 @@ function start_discovery { 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/kubernetes-discovery/hack/build-image.sh + ${KUBE_ROOT}/cmd/kube-aggregator/hack/build-image.sh - kubectl_core -n kube-public create -f "${KUBE_ROOT}/cmd/kubernetes-discovery/artifacts/local-cluster-up" + kubectl_core -n kube-public create -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/local-cluster-up" ${sudo} cp "${CERT_DIR}/admin.kubeconfig" "${CERT_DIR}/admin-discovery.kubeconfig" ${sudo} chown ${USER} "${CERT_DIR}/admin-discovery.kubeconfig" ${kubectl} config set-cluster local-up-cluster --kubeconfig="${CERT_DIR}/admin-discovery.kubeconfig" --certificate-authority="${CERT_DIR}/discovery-ca.crt" --embed-certs --server="https://${API_HOST_IP}:${DISCOVERY_SECURE_PORT}" - # Wait for kubernetes-discovery to come up before launching the rest of the components. + # Wait for kube-aggregator to come up before launching the rest of the components. # This should work since we're creating a node port service. - echo "Waiting for kubernetes-discovery to come up: https://${API_HOST_IP}:${DISCOVERY_SECURE_PORT}/version" - kube::util::wait_for_url "https://${API_HOST_IP}:${DISCOVERY_SECURE_PORT}/version" "kubernetes-discovery: " 1 60 || exit 1 + echo "Waiting for kube-aggregator to come up: https://${API_HOST_IP}:${DISCOVERY_SECURE_PORT}/version" + kube::util::wait_for_url "https://${API_HOST_IP}:${DISCOVERY_SECURE_PORT}/version" "kube-aggregator: " 1 60 || exit 1 # something is weird with the proxy sleep 1 # create the "normal" api services for the core API server - ${kubectl} --kubeconfig="${CERT_DIR}/admin-discovery.kubeconfig" create -f "${KUBE_ROOT}/cmd/kubernetes-discovery/artifacts/core-apiservices" + ${kubectl} --kubeconfig="${CERT_DIR}/admin-discovery.kubeconfig" create -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/core-apiservices" } kube::util::test_openssl_installed diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index e7d30d3169e..fbcf998c242 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -103,4 +103,4 @@ ${informergen} \ # You may add additional calls of code generators like set-gen above. # call generation on sub-project for now -cmd/kubernetes-discovery/hack/update-codegen.sh +cmd/kube-aggregator/hack/update-codegen.sh diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 83013249812..6b70557629e 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/kubernetes-discovery/hack/verify-codegen.sh +cmd/kube-aggregator/hack/verify-codegen.sh "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go index a8d28ac58b3..165dfa51910 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go @@ -232,7 +232,7 @@ func ClusterRoles() []rbac.ClusterRole { }, { // a role to use for the API registry, summarization, and proxy handling - ObjectMeta: api.ObjectMeta{Name: "system:kubernetes-discovery"}, + ObjectMeta: api.ObjectMeta{Name: "system:kube-aggregator"}, Rules: []rbac.PolicyRule{ // it needs to see all services so that it knows whether the ones it points to exist or not rbac.NewRule(Read...).Groups(legacyGroup).Resources("services", "endpoints").RuleOrDie(), diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml index c693b81fc7d..b0ad1b0d93c 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml @@ -388,6 +388,24 @@ items: - /version verbs: - get +- apiVersion: rbac.authorization.k8s.io/v1alpha1 + kind: ClusterRole + metadata: + creationTimestamp: null + labels: + kubernetes.io/bootstrapping: rbac-defaults + name: system:kube-aggregator + rules: + - apiGroups: + - "" + attributeRestrictions: null + resources: + - endpoints + - services + verbs: + - get + - list + - watch - apiVersion: rbac.authorization.k8s.io/v1alpha1 kind: ClusterRole metadata: @@ -472,24 +490,6 @@ items: verbs: - list - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 - kind: ClusterRole - metadata: - creationTimestamp: null - labels: - kubernetes.io/bootstrapping: rbac-defaults - name: system:kubernetes-discovery - rules: - - apiGroups: - - "" - attributeRestrictions: null - resources: - - endpoints - - services - verbs: - - get - - list - - watch - apiVersion: rbac.authorization.k8s.io/v1alpha1 kind: ClusterRole metadata: diff --git a/test/integration/discoverysummarizer/BUILD b/test/integration/discoverysummarizer/BUILD index bb9f5e8e7dc..9a7271f67e2 100644 --- a/test/integration/discoverysummarizer/BUILD +++ b/test/integration/discoverysummarizer/BUILD @@ -12,7 +12,7 @@ go_test( srcs = ["discoverysummarizer_test.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/legacy:go_default_library", + "//cmd/kube-aggregator/pkg/legacy:go_default_library", "//examples/apiserver:go_default_library", ], ) diff --git a/test/integration/discoverysummarizer/discoverysummarizer_test.go b/test/integration/discoverysummarizer/discoverysummarizer_test.go index 93c450fafbb..bde85808390 100644 --- a/test/integration/discoverysummarizer/discoverysummarizer_test.go +++ b/test/integration/discoverysummarizer/discoverysummarizer_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/legacy" + "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy" "k8s.io/kubernetes/examples/apiserver" ) @@ -47,7 +47,7 @@ func testResponse(t *testing.T, serverURL, path string, expectedStatusCode int) } func runDiscoverySummarizer(t *testing.T) string { - configFilePath := "../../../cmd/kubernetes-discovery/config.json" + configFilePath := "../../../cmd/kube-aggregator/config.json" port := "9090" serverURL := "http://localhost:" + port s, err := legacy.NewDiscoverySummarizer(configFilePath) diff --git a/test/test_owners.csv b/test/test_owners.csv index 14a25986a51..cf31cfc81d6 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -518,7 +518,7 @@ k8s.io/kubernetes/cmd/kubeadm/app/preflight,apprenda,0 k8s.io/kubernetes/cmd/kubeadm/app/util,krousey,1 k8s.io/kubernetes/cmd/kubeadm/test,pipejakob,0 k8s.io/kubernetes/cmd/kubelet/app,derekwaynecarr,0 -k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apiserver,brendandburns,0 +k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver,brendandburns,0 k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types,caesarxuchao,0 k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf,smarterclayton,0 k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators,davidopp,1