Merge pull request kubernetes#87368 from 928234269/fix_staticcheck01

k8s-ci-robot · web-flow · commit 62dc3ea6d13f · 2020-03-03T12:15:28.000-08:00
fix staticcheck errors in pkg/controller/daemon.
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -1,5 +1,4 @@
 cluster/images/etcd/migrate
-pkg/controller/daemon
 pkg/controller/deployment
 pkg/controller/garbagecollector
 pkg/controller/nodeipam
diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go
@@ -306,16 +306,6 @@ func (dsc *DaemonSetsController) enqueue(ds *apps.DaemonSet) {
 	dsc.queue.Add(key)
 }
 
-func (dsc *DaemonSetsController) enqueueRateLimited(ds *apps.DaemonSet) {
-	key, err := controller.KeyFunc(ds)
-	if err != nil {
-		utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %#v: %v", ds, err))
-		return
-	}
-
-	dsc.queue.AddRateLimited(key)
-}
-
 func (dsc *DaemonSetsController) enqueueDaemonSetAfter(obj interface{}, after time.Duration) {
 	key, err := controller.KeyFunc(obj)
 	if err != nil {
diff --git a/pkg/controller/daemon/daemon_controller_test.go b/pkg/controller/daemon/daemon_controller_test.go
@@ -223,7 +223,6 @@ type fakePodControl struct {
 	podStore     cache.Store
 	podIDMap     map[string]*v1.Pod
 	expectations controller.ControllerExpectationsInterface
-	dsc          *daemonSetsController
 }
 
 func newFakePodControl() *fakePodControl {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`cluster/images/etcd/migrate`
`2`		`-pkg/controller/daemon`
`3`	`2`	`pkg/controller/deployment`
`4`	`3`	`pkg/controller/garbagecollector`
`5`	`4`	`pkg/controller/nodeipam`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,6 @@ type fakePodControl struct {`
`223`	`223`	`podStore cache.Store`
`224`	`224`	`podIDMap map[string]*v1.Pod`
`225`	`225`	`expectations controller.ControllerExpectationsInterface`
`226`		`- dsc *daemonSetsController`
`227`	`226`	`}`
`228`	`227`
`229`	`228`	`func newFakePodControl() *fakePodControl {`