Skip to content

Commit ed2d2a9

Browse files
mjudeikismjudeikis
committed
noop: Fixup imports to be consistent.
Signed-off-by: Mangirdas Judeikis <[email protected]>
1 parent 85ecae8 commit ed2d2a9

File tree

30 files changed

+179
-179
lines changed

30 files changed

+179
-179
lines changed

‎pkg/admission/kubequota/kubequota_clusterworkspace_monitor.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
kcpcache "github.com/kcp-dev/apimachinery/v2/pkg/cache"
2424
"github.com/kcp-dev/logicalcluster/v3"
2525

26-
"k8s.io/apimachinery/pkg/util/runtime"
26+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2727
"k8s.io/apimachinery/pkg/util/wait"
2828
"k8s.io/client-go/tools/cache"
2929
"k8s.io/client-go/util/workqueue"
@@ -68,15 +68,15 @@ func NewLogicalClusterDeletionMonitor(
6868
func (m *LogicalClusterDeletionMonitor) enqueue(obj interface{}) {
6969
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(obj)
7070
if err != nil {
71-
runtime.HandleError(err)
71+
utilruntime.HandleError(err)
7272
return
7373
}
7474

7575
m.queue.Add(key)
7676
}
7777

7878
func (m *LogicalClusterDeletionMonitor) Start(stop <-chan struct{}) {
79-
defer runtime.HandleCrash()
79+
defer utilruntime.HandleCrash()
8080
defer m.queue.ShutDown()
8181

8282
logger := logging.WithReconciler(klog.Background(), m.name)
@@ -107,7 +107,7 @@ func (m *LogicalClusterDeletionMonitor) processNextWorkItem() bool {
107107

108108
if err := m.process(key); err != nil {
109109
//nolint:revive
110-
runtime.HandleError(fmt.Errorf("LogicalClusterDeletionMonitor failed to sync %q, err: %w", key, err))
110+
utilruntime.HandleError(fmt.Errorf("LogicalClusterDeletionMonitor failed to sync %q, err: %w", key, err))
111111

112112
m.queue.AddRateLimited(key)
113113

@@ -123,7 +123,7 @@ func (m *LogicalClusterDeletionMonitor) processNextWorkItem() bool {
123123
func (m *LogicalClusterDeletionMonitor) process(key string) error {
124124
clusterName, _, _, err := kcpcache.SplitMetaClusterNamespaceKey(key)
125125
if err != nil {
126-
runtime.HandleError(err)
126+
utilruntime.HandleError(err)
127127
return nil
128128
}
129129

‎pkg/features/kcp_features.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/spf13/pflag"
2525

26-
"k8s.io/apimachinery/pkg/util/runtime"
26+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2727
genericfeatures "k8s.io/apiserver/pkg/features"
2828
utilfeature "k8s.io/apiserver/pkg/util/feature"
2929
"k8s.io/component-base/featuregate"
@@ -47,7 +47,7 @@ const (
4747
var DefaultFeatureGate = utilfeature.DefaultFeatureGate
4848

4949
func init() {
50-
runtime.Must(utilfeature.DefaultMutableFeatureGate.Add(defaultGenericControlPlaneFeatureGates))
50+
utilruntime.Must(utilfeature.DefaultMutableFeatureGate.Add(defaultGenericControlPlaneFeatureGates))
5151
}
5252

5353
func KnownFeatures() []string {

‎pkg/proxy/index/index_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/kcp-dev/logicalcluster/v3"
2626

2727
"k8s.io/apimachinery/pkg/api/errors"
28-
"k8s.io/apimachinery/pkg/util/runtime"
28+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
"k8s.io/client-go/tools/cache"
3131
"k8s.io/client-go/util/workqueue"
@@ -133,7 +133,7 @@ type Controller struct {
133133
// Start the controller. It does not really do anything, but to keep the shape of a normal
134134
// controller, we keep it.
135135
func (c *Controller) Start(ctx context.Context, numThreads int) {
136-
defer runtime.HandleCrash()
136+
defer utilruntime.HandleCrash()
137137
defer func() {
138138
c.lock.Lock()
139139
defer c.lock.Unlock()
@@ -156,7 +156,7 @@ func (c *Controller) Start(ctx context.Context, numThreads int) {
156156
func (c *Controller) enqueueShard(ctx context.Context, obj interface{}) {
157157
key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
158158
if err != nil {
159-
runtime.HandleError(err)
159+
utilruntime.HandleError(err)
160160
return
161161
}
162162

@@ -188,7 +188,7 @@ func (c *Controller) processNextWorkItem(ctx context.Context) bool {
188188
defer c.queue.Done(key)
189189

190190
if err := c.process(ctx, key); err != nil {
191-
runtime.HandleError(fmt.Errorf("%q controller failed to sync %q, err: %w", controllerName, key, err))
191+
utilruntime.HandleError(fmt.Errorf("%q controller failed to sync %q, err: %w", controllerName, key, err))
192192
c.queue.AddRateLimited(key)
193193
return true
194194
}
@@ -201,7 +201,7 @@ func (c *Controller) process(ctx context.Context, key string) error {
201201

202202
_, name, err := cache.SplitMetaNamespaceKey(key)
203203
if err != nil {
204-
runtime.HandleError(err)
204+
utilruntime.HandleError(err)
205205
return nil
206206
}
207207
shard, err := c.shardLister.Get(name)

‎pkg/proxy/proxy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"net/url"
2727
"os"
2828

29-
"k8s.io/apimachinery/pkg/util/runtime"
29+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3030
userinfo "k8s.io/apiserver/pkg/authentication/user"
3131
"k8s.io/apiserver/pkg/endpoints/request"
3232
)
@@ -88,7 +88,7 @@ func newShardReverseProxy() *httputil.ReverseProxy {
8888
shardURL := ShardURLFrom(req.Context())
8989
if shardURL == nil {
9090
// should not happen if wiring is correct
91-
runtime.HandleError(fmt.Errorf("no shard URL found in request context"))
91+
utilruntime.HandleError(fmt.Errorf("no shard URL found in request context"))
9292
req.URL.Scheme = "https"
9393
req.URL.Host = "notfound"
9494
return

‎pkg/reconciler/apis/apibindingdeletion/apibinding_deletion_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/runtime/schema"
34-
"k8s.io/apimachinery/pkg/util/runtime"
34+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3535
"k8s.io/apimachinery/pkg/util/wait"
3636
"k8s.io/client-go/tools/cache"
3737
"k8s.io/client-go/util/workqueue"
@@ -132,7 +132,7 @@ type Controller struct {
132132
func (c *Controller) enqueue(obj interface{}) {
133133
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(obj)
134134
if err != nil {
135-
runtime.HandleError(err)
135+
utilruntime.HandleError(err)
136136
return
137137
}
138138
logger := logging.WithQueueKey(logging.WithReconciler(klog.Background(), ControllerName), key)
@@ -141,7 +141,7 @@ func (c *Controller) enqueue(obj interface{}) {
141141
}
142142

143143
func (c *Controller) Start(ctx context.Context, numThreads int) {
144-
defer runtime.HandleCrash()
144+
defer utilruntime.HandleCrash()
145145
defer c.queue.ShutDown()
146146

147147
logger := logging.WithReconciler(klog.FromContext(ctx), ControllerName)
@@ -194,7 +194,7 @@ func (c *Controller) processNextWorkItem(ctx context.Context) bool {
194194
} else {
195195
// rather than wait for a full resync, re-add the workspace to the queue to be processed
196196
c.queue.AddRateLimited(key)
197-
runtime.HandleError(fmt.Errorf("deletion of apibinding %v failed: %w", key, err))
197+
utilruntime.HandleError(fmt.Errorf("deletion of apibinding %v failed: %w", key, err))
198198
}
199199

200200
return true
@@ -205,7 +205,7 @@ func (c *Controller) process(ctx context.Context, key string) error {
205205
startTime := time.Now()
206206
cluster, _, name, err := kcpcache.SplitMetaClusterNamespaceKey(key)
207207
if err != nil {
208-
runtime.HandleError(err)
208+
utilruntime.HandleError(err)
209209
return nil
210210
}
211211
clusterName := logicalcluster.Name(cluster.String()) // TODO: remove when SplitMetaClusterNamespaceKey is updated
@@ -220,7 +220,7 @@ func (c *Controller) process(ctx context.Context, key string) error {
220220
return nil
221221
}
222222
if deleteErr != nil {
223-
runtime.HandleError(fmt.Errorf("unable to retrieve apibinding %v from store: %w", key, deleteErr))
223+
utilruntime.HandleError(fmt.Errorf("unable to retrieve apibinding %v from store: %w", key, deleteErr))
224224
return deleteErr
225225
}
226226
logger = logging.WithObject(logger, apibinding)

‎pkg/reconciler/apis/apiexport/apiexport_controller.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/labels"
3333
utilerrors "k8s.io/apimachinery/pkg/util/errors"
34-
"k8s.io/apimachinery/pkg/util/runtime"
34+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3535
"k8s.io/apimachinery/pkg/util/wait"
3636
"k8s.io/client-go/tools/cache"
3737
"k8s.io/client-go/util/workqueue"
@@ -200,7 +200,7 @@ type controller struct {
200200
func (c *controller) enqueueAPIExport(apiExport *apisv1alpha1.APIExport) {
201201
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(apiExport)
202202
if err != nil {
203-
runtime.HandleError(err)
203+
utilruntime.HandleError(err)
204204
return
205205
}
206206

@@ -212,15 +212,15 @@ func (c *controller) enqueueAPIExport(apiExport *apisv1alpha1.APIExport) {
212212
func (c *controller) enqueueAllAPIExports(shard *corev1alpha1.Shard) {
213213
list, err := c.listAPIExports()
214214
if err != nil {
215-
runtime.HandleError(err)
215+
utilruntime.HandleError(err)
216216
return
217217
}
218218

219219
logger := logging.WithObject(logging.WithReconciler(klog.Background(), ControllerName), shard)
220220
for i := range list {
221221
key, err := kcpcache.MetaClusterNamespaceKeyFunc(list[i])
222222
if err != nil {
223-
runtime.HandleError(err)
223+
utilruntime.HandleError(err)
224224
continue
225225
}
226226

@@ -232,15 +232,15 @@ func (c *controller) enqueueAllAPIExports(shard *corev1alpha1.Shard) {
232232
func (c *controller) enqueueSecret(secret *corev1.Secret) {
233233
apiExports, err := c.listAPIExportsForSecret(secret)
234234
if err != nil {
235-
runtime.HandleError(err)
235+
utilruntime.HandleError(err)
236236
return
237237
}
238238

239239
logger := logging.WithObject(logging.WithReconciler(klog.Background(), ControllerName), secret)
240240
for _, apiExport := range apiExports {
241241
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(apiExport)
242242
if err != nil {
243-
runtime.HandleError(err)
243+
utilruntime.HandleError(err)
244244
return
245245
}
246246
logging.WithQueueKey(logger, key).V(3).Info("queueing APIExport via identity Secret")
@@ -250,7 +250,7 @@ func (c *controller) enqueueSecret(secret *corev1.Secret) {
250250

251251
// Start starts the controller, which stops when ctx.Done() is closed.
252252
func (c *controller) Start(ctx context.Context, numThreads int) {
253-
defer runtime.HandleCrash()
253+
defer utilruntime.HandleCrash()
254254
defer c.queue.ShutDown()
255255

256256
logger := logging.WithReconciler(klog.FromContext(ctx), ControllerName)
@@ -287,7 +287,7 @@ func (c *controller) processNextWorkItem(ctx context.Context) bool {
287287
defer c.queue.Done(key)
288288

289289
if err := c.process(ctx, key); err != nil {
290-
runtime.HandleError(fmt.Errorf("%q controller failed to sync %q, err: %w", ControllerName, key, err))
290+
utilruntime.HandleError(fmt.Errorf("%q controller failed to sync %q, err: %w", ControllerName, key, err))
291291
c.queue.AddRateLimited(key)
292292
return true
293293
}
@@ -298,7 +298,7 @@ func (c *controller) processNextWorkItem(ctx context.Context) bool {
298298
func (c *controller) process(ctx context.Context, key string) error {
299299
cluster, _, name, err := kcpcache.SplitMetaClusterNamespaceKey(key)
300300
if err != nil {
301-
runtime.HandleError(err)
301+
utilruntime.HandleError(err)
302302
return nil
303303
}
304304

‎pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/api/errors"
2929
"k8s.io/apimachinery/pkg/labels"
3030
utilerrors "k8s.io/apimachinery/pkg/util/errors"
31-
"k8s.io/apimachinery/pkg/util/runtime"
31+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3232
"k8s.io/apimachinery/pkg/util/sets"
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
"k8s.io/client-go/tools/cache"
@@ -181,7 +181,7 @@ type controller struct {
181181
func (c *controller) enqueueAPIExportEndpointSlice(obj interface{}) {
182182
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(obj)
183183
if err != nil {
184-
runtime.HandleError(err)
184+
utilruntime.HandleError(err)
185185
return
186186
}
187187

@@ -197,7 +197,7 @@ func (c *controller) enqueueAPIExportEndpointSlicesForAPIExport(obj interface{})
197197
}
198198
export, ok := obj.(*apisv1alpha1.APIExport)
199199
if !ok {
200-
runtime.HandleError(fmt.Errorf("obj is supposed to be a APIExport, but is %T", obj))
200+
utilruntime.HandleError(fmt.Errorf("obj is supposed to be a APIExport, but is %T", obj))
201201
return
202202
}
203203

@@ -206,23 +206,23 @@ func (c *controller) enqueueAPIExportEndpointSlicesForAPIExport(obj interface{})
206206
if path := logicalcluster.NewPath(export.Annotations[core.LogicalClusterPathAnnotationKey]); !path.Empty() {
207207
pathKeys, err := c.apiExportEndpointSliceClusterInformer.Informer().GetIndexer().IndexKeys(indexAPIExportEndpointSliceByAPIExport, path.Join(export.Name).String())
208208
if err != nil {
209-
runtime.HandleError(err)
209+
utilruntime.HandleError(err)
210210
return
211211
}
212212
keys.Insert(pathKeys...)
213213
}
214214

215215
clusterKeys, err := c.apiExportEndpointSliceClusterInformer.Informer().GetIndexer().IndexKeys(indexAPIExportEndpointSliceByAPIExport, logicalcluster.From(export).Path().Join(export.Name).String())
216216
if err != nil {
217-
runtime.HandleError(err)
217+
utilruntime.HandleError(err)
218218
return
219219
}
220220
keys.Insert(clusterKeys...)
221221

222222
for _, key := range sets.List[string](keys) {
223223
slice, exists, err := c.apiExportEndpointSliceClusterInformer.Informer().GetIndexer().GetByKey(key)
224224
if err != nil {
225-
runtime.HandleError(err)
225+
utilruntime.HandleError(err)
226226
continue
227227
} else if !exists {
228228
continue
@@ -237,15 +237,15 @@ func (c *controller) enqueueAPIExportEndpointSlicesForAPIExport(obj interface{})
237237
func (c *controller) enqueueAllAPIExportEndpointSlices(shard interface{}) {
238238
list, err := c.listAPIExportEndpointSlices()
239239
if err != nil {
240-
runtime.HandleError(err)
240+
utilruntime.HandleError(err)
241241
return
242242
}
243243

244244
logger := logging.WithObject(logging.WithReconciler(klog.Background(), ControllerName), shard.(*corev1alpha1.Shard))
245245
for i := range list {
246246
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(list[i])
247247
if err != nil {
248-
runtime.HandleError(err)
248+
utilruntime.HandleError(err)
249249
continue
250250
}
251251

@@ -258,13 +258,13 @@ func (c *controller) enqueueAllAPIExportEndpointSlices(shard interface{}) {
258258
func (c *controller) enqueuePartition(obj interface{}) {
259259
key, err := kcpcache.DeletionHandlingMetaClusterNamespaceKeyFunc(obj)
260260
if err != nil {
261-
runtime.HandleError(err)
261+
utilruntime.HandleError(err)
262262
return
263263
}
264264

265265
slices, err := c.getAPIExportEndpointSlicesByPartition(key)
266266
if err != nil {
267-
runtime.HandleError(err)
267+
utilruntime.HandleError(err)
268268
return
269269
}
270270

@@ -277,7 +277,7 @@ func (c *controller) enqueuePartition(obj interface{}) {
277277

278278
// Start starts the controller, which stops when ctx.Done() is closed.
279279
func (c *controller) Start(ctx context.Context, numThreads int) {
280-
defer runtime.HandleCrash()
280+
defer utilruntime.HandleCrash()
281281
defer c.queue.ShutDown()
282282

283283
logger := logging.WithReconciler(klog.FromContext(ctx), ControllerName)
@@ -314,7 +314,7 @@ func (c *controller) processNextWorkItem(ctx context.Context) bool {
314314
defer c.queue.Done(key)
315315

316316
if err := c.process(ctx, key); err != nil {
317-
runtime.HandleError(fmt.Errorf("%q controller failed to sync %q, err: %w", ControllerName, key, err))
317+
utilruntime.HandleError(fmt.Errorf("%q controller failed to sync %q, err: %w", ControllerName, key, err))
318318
c.queue.AddRateLimited(key)
319319
return true
320320
}
@@ -325,7 +325,7 @@ func (c *controller) processNextWorkItem(ctx context.Context) bool {
325325
func (c *controller) process(ctx context.Context, key string) error {
326326
clusterName, _, name, err := kcpcache.SplitMetaClusterNamespaceKey(key)
327327
if err != nil {
328-
runtime.HandleError(err)
328+
utilruntime.HandleError(err)
329329
return nil
330330
}
331331
obj, err := c.getAPIExportEndpointSlice(clusterName, name)

0 commit comments

Comments
 (0)