diff --git a/go.mod b/go.mod index 240cb24a..9f8eab4c 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.0 - k8s.io/api v0.0.0-20220722161209-9a18f7af64ea - k8s.io/apimachinery v0.0.0-20220722160306-066110477272 + k8s.io/api v0.0.0-20220722161209-f77fa25e8904 + k8s.io/apimachinery v0.0.0-20220722160307-915d89afb4cb k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 @@ -61,6 +61,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220722161209-9a18f7af64ea - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220722160306-066110477272 + k8s.io/api => k8s.io/api v0.0.0-20220722161209-f77fa25e8904 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220722160307-915d89afb4cb ) diff --git a/go.sum b/go.sum index 92c0bbe6..0af542d9 100644 --- a/go.sum +++ b/go.sum @@ -479,10 +479,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20220722161209-9a18f7af64ea h1:MiYxdszYyKHmf2sdDWFDd98Np+DMLLUDrBeRd1Ke6EI= -k8s.io/api v0.0.0-20220722161209-9a18f7af64ea/go.mod h1:ohV8ZX/DUd8BAQLw1YBcZo6qQ0u5oW1obsjteznQh6s= -k8s.io/apimachinery v0.0.0-20220722160306-066110477272 h1:lP7eyx/jwkCcmKA3LYf1pYGcsflSINRJLdLuhDZBcmc= -k8s.io/apimachinery v0.0.0-20220722160306-066110477272/go.mod h1:E6C2QnwpsJTXktTwPqd4nAJ/xmsdi1AHqDD0iPB61j0= +k8s.io/api v0.0.0-20220722161209-f77fa25e8904 h1:0e3sqfqka9TQC0vBbSDYxUYkxuIjA4xBOErf8T4ldhU= +k8s.io/api v0.0.0-20220722161209-f77fa25e8904/go.mod h1:ohV8ZX/DUd8BAQLw1YBcZo6qQ0u5oW1obsjteznQh6s= +k8s.io/apimachinery v0.0.0-20220722160307-915d89afb4cb h1:CkEjGDsYVgTZod3JtHw5+t2LG2ZoEQpGlvjdQTiiosA= +k8s.io/apimachinery v0.0.0-20220722160307-915d89afb4cb/go.mod h1:E6C2QnwpsJTXktTwPqd4nAJ/xmsdi1AHqDD0iPB61j0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= diff --git a/rest/connection_test.go b/rest/connection_test.go index 89d1b351..323c9eec 100644 --- a/rest/connection_test.go +++ b/rest/connection_test.go @@ -169,7 +169,7 @@ func TestReconnectBrokenTCP(t *testing.T) { // 2. the connection has keepalive enabled so it will be reused // 3. break the TCP connection stopping the proxy // 4. close the idle connection to force creating a new connection -// 5. count that there are 2 connection to the server (we didn't reuse the original connection) +// 5. count that there are 2 connections to the server (we didn't reuse the original connection) func TestReconnectBrokenTCP_HTTP1(t *testing.T) { ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fmt.Fprintf(w, "Hello, %s", r.Proto) @@ -245,7 +245,7 @@ func TestReconnectBrokenTCP_HTTP1(t *testing.T) { // 1. connect to https server with http1.1 using a TCP proxy making the connection to timeout // 2. the connection has keepalive enabled so it will be reused // 3. close the in-flight connection to force creating a new connection -// 4. count that there are 2 connection on the LB but only one succeeds +// 4. count that there are 2 connections on the LB but only one succeeds func TestReconnectBrokenTCPInFlight_HTTP1(t *testing.T) { done := make(chan struct{}) defer close(done) diff --git a/rest/with_retry.go b/rest/with_retry.go index 383a7ca7..bdcc6f3a 100644 --- a/rest/with_retry.go +++ b/rest/with_retry.go @@ -222,7 +222,7 @@ func (r *withRetry) Before(ctx context.Context, request *Request) error { } } - // if we are here, we have made attempt(s) al least once before. + // if we are here, we have made attempt(s) at least once before. if request.backoff != nil { delay := request.backoff.CalculateBackoff(url) if r.retryAfter.Wait > delay {