github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Alias api/errors instead of stdlib errors

Browse Source
This commit is contained in:
Timo Reimann 2022-10-21 14:08:29 +02:00
parent a179203bdb
commit ea4ce5dc28
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/cloud-provider/controllers/service/controller.go
View File

@ -18,14 +18,14 @@ package service
import ( import (
"context" "context"
stderrors "errors" "errors"
"fmt" "fmt"
"reflect" "reflect"
"sync" "sync"
"time" "time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
@ -291,7 +291,7 @@ func (c *Controller) processNextServiceItem(ctx context.Context) bool {
} }
var re *api.RetryError var re *api.RetryError
if stderrors.As(err, &re) { if errors.As(err, &re) {
klog.V(4).Infof("Retrying processing for service %v in %s", key, re.RetryAfter()) klog.V(4).Infof("Retrying processing for service %v in %s", key, re.RetryAfter())
c.serviceQueue.AddAfter(key, re.RetryAfter()) c.serviceQueue.AddAfter(key, re.RetryAfter())
} else { } else {
@ -424,7 +424,7 @@ func (c *Controller) syncLoadBalancerIfNeeded(ctx context.Context, service *v1.S
// - Not found error mostly happens when service disappears right after // - Not found error mostly happens when service disappears right after
// we remove the finalizer. // we remove the finalizer.
// - We can't patch status on non-exist service anyway. // - We can't patch status on non-exist service anyway.
if !errors.IsNotFound(err) { if !apierrors.IsNotFound(err) {
return op, fmt.Errorf("failed to update load balancer status: %v", err) return op, fmt.Errorf("failed to update load balancer status: %v", err)
} }
} }
@ -846,7 +846,7 @@ func (c *Controller) syncService(ctx context.Context, key string) error {
// service holds the latest service info from apiserver // service holds the latest service info from apiserver
service, err := c.serviceLister.Services(namespace).Get(name) service, err := c.serviceLister.Services(namespace).Get(name)
switch { switch {
case errors.IsNotFound(err): case apierrors.IsNotFound(err):
// service absence in store means watcher caught the deletion, ensure LB info is cleaned // service absence in store means watcher caught the deletion, ensure LB info is cleaned
err = c.processServiceDeletion(ctx, key) err = c.processServiceDeletion(ctx, key)
case err != nil: case err != nil: