diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c59e997e6..dae985cfd 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -456,11 +456,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "88ad409c1fcc" + "Rev": "9e320febc26e" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "000b5f4f8623" + "Rev": "671277bf9349" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 9c4f8fa4b..290a79c6e 100644 --- a/go.mod +++ b/go.mod @@ -26,14 +26,14 @@ require ( golang.org/x/net v0.0.0-20200707034311-ab3426394381 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - k8s.io/api v0.0.0-20201112122247-88ad409c1fcc - k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623 + k8s.io/api v0.0.0-20201113002300-9e320febc26e + k8s.io/apimachinery v0.0.0-20201113023623-671277bf9349 k8s.io/klog/v2 v2.4.0 k8s.io/utils v0.0.0-20201104234853-8146046b121e sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20201112122247-88ad409c1fcc - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623 + k8s.io/api => k8s.io/api v0.0.0-20201113002300-9e320febc26e + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201113023623-671277bf9349 ) diff --git a/go.sum b/go.sum index 2d3452346..171d4f8e5 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -k8s.io/api v0.0.0-20201112122247-88ad409c1fcc/go.mod h1:kdpOjtJg1fLz8kIoeBe0Ohm3dngnl37spUZUciyX7Ho= -k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623/go.mod h1:C4HVOTZCaKwcNDaxwQoXe3Zk6BLT5jNivqfdcniEtuY= +k8s.io/api v0.0.0-20201113002300-9e320febc26e/go.mod h1:XraaYPIr83qvGlL2a/ejmFGq+OziqYEy9CJ8AWtXnpc= +k8s.io/apimachinery v0.0.0-20201113023623-671277bf9349/go.mod h1:C4HVOTZCaKwcNDaxwQoXe3Zk6BLT5jNivqfdcniEtuY= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= diff --git a/transport/config.go b/transport/config.go index 0c9ccce27..070474831 100644 --- a/transport/config.go +++ b/transport/config.go @@ -108,7 +108,7 @@ func (c *Config) HasCertAuth() bool { return (len(c.TLS.CertData) != 0 || len(c.TLS.CertFile) != 0) && (len(c.TLS.KeyData) != 0 || len(c.TLS.KeyFile) != 0) } -// HasCertCallbacks returns whether the configuration has certificate callback or not. +// HasCertCallback returns whether the configuration has certificate callback or not. func (c *Config) HasCertCallback() bool { return c.TLS.GetCert != nil } diff --git a/transport/round_trippers.go b/transport/round_trippers.go index b198e5dbb..056bc023c 100644 --- a/transport/round_trippers.go +++ b/transport/round_trippers.go @@ -146,6 +146,7 @@ type userAgentRoundTripper struct { rt http.RoundTripper } +// NewUserAgentRoundTripper will add User-Agent header to a request unless it has already been set. func NewUserAgentRoundTripper(agent string, rt http.RoundTripper) http.RoundTripper { return &userAgentRoundTripper{agent, rt} } @@ -260,7 +261,7 @@ func NewBearerAuthRoundTripper(bearer string, rt http.RoundTripper) http.RoundTr return &bearerAuthRoundTripper{bearer, nil, rt} } -// NewBearerAuthRoundTripper adds the provided bearer token to a request +// NewBearerAuthWithRefreshRoundTripper adds the provided bearer token to a request // unless the authorization header has already been set. // If tokenFile is non-empty, it is periodically read, // and the last successfully read content is used as the bearer token.