From 09cd56b561d0c31421dfc6374b68e0b18c6cc746 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Sun, 28 Jun 2020 15:26:40 -0500 Subject: [PATCH] changes in imports was unintentional Signed-off-by: Ken Sipe --- staging/src/k8s.io/apiserver/pkg/authorization/union/union.go | 1 - .../k8s.io/apiserver/pkg/registry/generic/registry/store.go | 3 +-- .../util/flowcontrol/fairqueuing/testing/clock/event_clock.go | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go index 568e503e697..460d9a4ab57 100644 --- a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go +++ b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go @@ -29,7 +29,6 @@ import ( "strings" utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" ) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go index 668161352bb..2e0f7d9ecd4 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go @@ -38,8 +38,6 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/tools/cache" - genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/rest" @@ -47,6 +45,7 @@ import ( storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/apiserver/pkg/storage/etcd3/metrics" "k8s.io/apiserver/pkg/util/dryrun" + "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go index d45a35e5257..c5464986f48 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go @@ -25,9 +25,8 @@ import ( "time" "k8s.io/apimachinery/pkg/util/clock" - "k8s.io/klog/v2" - "k8s.io/apiserver/pkg/util/flowcontrol/counter" + "k8s.io/klog/v2" ) // EventFunc does some work that needs to be done at or after the