rename kubernetes-discovery to kube-aggregator

build/BUILD

@@ -46,7 +46,7 @@ docker_build(
     "kube-apiserver",
     "kube-controller-manager",
     "kube-scheduler",
-    "kubernetes-discovery",
+    "kube-aggregator",
 ]]
 
 docker_build(

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

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",
 )
 

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",

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"],
+)

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

cmd/kube-aggregator/artifacts/local-cluster-up/kubernetes-discovery-sa.yaml

@@ -1,4 +1,4 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: kubernetes-discovery
+  name: kube-aggregator

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

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"]

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

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
   "$@"

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() {

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"],
 )

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",
     ],

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{

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",

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

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"

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",

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 {

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",

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

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 {

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/<group: -apiregistration.k8s.io>.

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 {

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

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 {

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"],
 )

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"

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

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",

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"

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

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"],
 )

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"

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

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",

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

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"
 )

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"

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"],
 )

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"

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

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",

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"

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

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"],
 )

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"

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

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",

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

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"
 )

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"

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"],
+)

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"],
 )

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.

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",

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"

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.

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",

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"

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.

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"

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"
 )

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",
     ],

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"

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",

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"

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
 

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",

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"

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