remove cmdutil dependency

cmd/kube-aggregator/pkg/apiserver/BUILD

@@ -51,7 +51,7 @@ go_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/controller:go_default_library",
+        "//pkg/api/install:go_default_library",
         "//pkg/version:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",

cmd/kube-aggregator/pkg/apiserver/apiserver.go

@@ -39,6 +39,8 @@ import (
 	informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion"
 	listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
 	apiservicestorage "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice/etcd"
+
+	_ "k8s.io/kubernetes/pkg/api/install"
 )
 
 // legacyAPIServiceName is the fixed name of the only non-groupified API version

cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/kubernetes/pkg/controller"
 
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	informers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion"
@@ -122,7 +121,7 @@ func (c *APIServiceRegistrationController) processNextWorkItem() bool {
 }
 
 func (c *APIServiceRegistrationController) enqueue(obj *apiregistration.APIService) {
-	key, err := controller.KeyFunc(obj)
+	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		glog.Errorf("Couldn't get key for object %#v: %v", obj, err)
 		return

cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go

@@ -81,7 +81,8 @@ func TestAPIsDelegation(t *testing.T) {
 			continue
 		}
 		if resp.StatusCode != http.StatusOK {
-			httputil.DumpResponse(resp, true)
+			bytes, _ := httputil.DumpResponse(resp, true)
+			t.Log(string(bytes))
 			t.Errorf("%s: %v", path, err)
 			continue
 		}