Merge pull request #65390 from cfork/test

Automatic merge from submit-queue (batch tested with PRs 65518, 65624, 65380, 65390, 65586). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

cleanup: remove deadcode

/kind cleanup

remove deadcode
remove unnecessary conversion

```release-note
NONE
```

Kubernetes-commit: 16dbb95c51532e8a937a3ccb90223e8568b130c3

pkg/endpoints/installer.go

@@ -862,13 +862,6 @@ func appendIf(actions []action, a action, shouldAppend bool) []action {
 	return actions
 }
 
-// Wraps a http.Handler function inside a restful.RouteFunction
-func routeFunction(handler http.Handler) restful.RouteFunction {
-	return func(restReq *restful.Request, restResp *restful.Response) {
-		handler.ServeHTTP(restResp.ResponseWriter, restReq.Request)
-	}
-}
-
 func addParams(route *restful.RouteBuilder, params []*restful.Parameter) {
 	for _, param := range params {
 		route.Param(param)

pkg/storage/etcd/etcd_watcher.go

@@ -22,7 +22,6 @@ import (
 	"net/http"
 	"reflect"
 	"sync"
-	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -100,9 +99,6 @@ type etcdWatcher struct {
 	cache etcdCache
 }
 
-// watchWaitDuration is the amount of time to wait for an error from watch.
-const watchWaitDuration = 100 * time.Millisecond
-
 // newEtcdWatcher returns a new etcdWatcher; if list is true, watch sub-nodes.
 // The versioner must be able to handle the objects that transform creates.
 func newEtcdWatcher(list bool, quorum bool, include includeFunc, pred storage.SelectionPredicate,

pkg/storage/etcd3/store.go

@@ -73,11 +73,6 @@ type store struct {
 	leaseManager  *leaseManager
 }
 
-type elemForDecode struct {
-	data []byte
-	rev  uint64
-}
-
 type objState struct {
 	obj   runtime.Object
 	meta  *storage.ResponseMeta