github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove cmdutil dependency

Browse Source
This commit is contained in:
deads2k
2017-02-13 10:58:59 -05:00
parent 739f4ffe0e
commit e60b16fea8
12 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kube-aggregator/pkg/apiserver/apiservice_controller.go
View File

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