github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89979 from gaurav1086/remove_dup_net_import

Browse Source 
Remove double import of k8s.io/apimachinery/pkg/util/net
This commit is contained in:
Kubernetes Prow Robot 2020-04-08 23:31:43 -07:00 committed by GitHub
commit 7b20442513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go
View File

@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/net"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
@ -51,7 +50,7 @@ type GenericWebhook struct {
// Otherwise it returns false for an immediate fail. // Otherwise it returns false for an immediate fail.
func DefaultShouldRetry(err error) bool { func DefaultShouldRetry(err error) bool {
// these errors indicate a transient error that should be retried. // these errors indicate a transient error that should be retried.
if net.IsConnectionReset(err) || apierrors.IsInternalError(err) || apierrors.IsTimeout(err) || apierrors.IsTooManyRequests(err) { if utilnet.IsConnectionReset(err) || apierrors.IsInternalError(err) || apierrors.IsTimeout(err) || apierrors.IsTooManyRequests(err) {
return true return true
} }
// if the error sends the Retry-After header, we respect it as an explicit confirmation we should retry. // if the error sends the Retry-After header, we respect it as an explicit confirmation we should retry.