Update k8s dependencies to v1.22.0

This commit is contained in:
Chris Henzie
2021-07-28 12:13:13 -07:00
parent 25abbf4848
commit e31f462805
4 changed files with 92 additions and 104 deletions

View File

@@ -145,7 +145,6 @@ func (r *Reservation) DelayFrom(now time.Time) time.Duration {
// Cancel is shorthand for CancelAt(time.Now()).
func (r *Reservation) Cancel() {
r.CancelAt(time.Now())
return
}
// CancelAt indicates that the reservation holder will not perform the reserved action
@@ -186,8 +185,6 @@ func (r *Reservation) CancelAt(now time.Time) {
r.lim.lastEvent = prevEvent
}
}
return
}
// Reserve is shorthand for ReserveN(time.Now(), 1).
@@ -367,20 +364,13 @@ func (lim *Limiter) advance(now time.Time) (newNow time.Time, newLast time.Time,
last = now
}
// Avoid making delta overflow below when last is very old.
maxElapsed := lim.limit.durationFromTokens(float64(lim.burst) - lim.tokens)
elapsed := now.Sub(last)
if elapsed > maxElapsed {
elapsed = maxElapsed
}
// Calculate the new number of tokens, due to time that passed.
elapsed := now.Sub(last)
delta := lim.limit.tokensFromDuration(elapsed)
tokens := lim.tokens + delta
if burst := float64(lim.burst); tokens > burst {
tokens = burst
}
return now, last, tokens
}
@@ -388,15 +378,11 @@ func (lim *Limiter) advance(now time.Time) (newNow time.Time, newLast time.Time,
// of time it takes to accumulate them at a rate of limit tokens per second.
func (limit Limit) durationFromTokens(tokens float64) time.Duration {
seconds := tokens / float64(limit)
return time.Nanosecond * time.Duration(1e9*seconds)
return time.Duration(float64(time.Second) * seconds)
}
// tokensFromDuration is a unit conversion function from a time duration to the number of tokens
// which could be accumulated during that duration at a rate of limit tokens per second.
func (limit Limit) tokensFromDuration(d time.Duration) float64 {
// Split the integer and fractional parts ourself to minimize rounding errors.
// See golang.org/issues/34861.
sec := float64(d/time.Second) * float64(limit)
nsec := float64(d%time.Second) * float64(limit)
return sec + nsec/1e9
return d.Seconds() * float64(limit)
}

58
vendor/modules.txt vendored
View File

@@ -140,7 +140,7 @@ golang.org/x/text/secure/bidirule
golang.org/x/text/transform
golang.org/x/text/unicode/bidi
golang.org/x/text/unicode/norm
# golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
# golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/time/rate
# google.golang.org/appengine v1.6.7
## explicit
@@ -239,7 +239,7 @@ gopkg.in/inf.v0
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
gopkg.in/yaml.v3
# k8s.io/api v0.22.0-rc.0 => k8s.io/api v0.22.0-rc.0
# k8s.io/api v0.22.0 => k8s.io/api v0.22.0
## explicit
k8s.io/api/admission/v1
k8s.io/api/admission/v1beta1
@@ -286,7 +286,7 @@ k8s.io/api/scheduling/v1beta1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apimachinery v0.22.0-rc.0 => k8s.io/apimachinery v0.22.0-rc.0
# k8s.io/apimachinery v0.22.0 => k8s.io/apimachinery v0.22.0
## explicit
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
k8s.io/apimachinery/pkg/api/errors
@@ -332,7 +332,7 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/client-go v0.22.0-rc.0 => k8s.io/client-go v0.22.0-rc.0
# k8s.io/client-go v0.22.0 => k8s.io/client-go v0.22.0
## explicit
k8s.io/client-go/applyconfigurations/admissionregistration/v1
k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1
@@ -595,7 +595,7 @@ k8s.io/client-go/util/flowcontrol
k8s.io/client-go/util/homedir
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/workqueue
# k8s.io/component-base v0.22.0-rc.0 => k8s.io/component-base v0.22.0-rc.0
# k8s.io/component-base v0.22.0 => k8s.io/component-base v0.22.0
## explicit
k8s.io/component-base/metrics
k8s.io/component-base/version
@@ -621,27 +621,27 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
sigs.k8s.io/yaml
# github.com/kubernetes-csi/external-snapshotter/client/v4 => ./client
# k8s.io/api => k8s.io/api v0.22.0-rc.0
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0-rc.0
# k8s.io/apimachinery => k8s.io/apimachinery v0.22.0-rc.0
# k8s.io/apiserver => k8s.io/apiserver v0.22.0-rc.0
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0-rc.0
# k8s.io/client-go => k8s.io/client-go v0.22.0-rc.0
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0-rc.0
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0-rc.0
# k8s.io/code-generator => k8s.io/code-generator v0.22.0-rc.0
# k8s.io/component-base => k8s.io/component-base v0.22.0-rc.0
# k8s.io/component-helpers => k8s.io/component-helpers v0.22.0-rc.0
# k8s.io/controller-manager => k8s.io/controller-manager v0.22.0-rc.0
# k8s.io/cri-api => k8s.io/cri-api v0.22.0-rc.0
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0-rc.0
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0-rc.0
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0-rc.0
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0-rc.0
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0-rc.0
# k8s.io/kubectl => k8s.io/kubectl v0.22.0-rc.0
# k8s.io/kubelet => k8s.io/kubelet v0.22.0-rc.0
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0-rc.0
# k8s.io/metrics => k8s.io/metrics v0.22.0-rc.0
# k8s.io/mount-utils => k8s.io/mount-utils v0.22.0-rc.0
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0-rc.0
# k8s.io/api => k8s.io/api v0.22.0
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0
# k8s.io/apimachinery => k8s.io/apimachinery v0.22.0
# k8s.io/apiserver => k8s.io/apiserver v0.22.0
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0
# k8s.io/client-go => k8s.io/client-go v0.22.0
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
# k8s.io/code-generator => k8s.io/code-generator v0.22.0
# k8s.io/component-base => k8s.io/component-base v0.22.0
# k8s.io/component-helpers => k8s.io/component-helpers v0.22.0
# k8s.io/controller-manager => k8s.io/controller-manager v0.22.0
# k8s.io/cri-api => k8s.io/cri-api v0.22.0
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0
# k8s.io/kubectl => k8s.io/kubectl v0.22.0
# k8s.io/kubelet => k8s.io/kubelet v0.22.0
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0
# k8s.io/metrics => k8s.io/metrics v0.22.0
# k8s.io/mount-utils => k8s.io/mount-utils v0.22.0
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0