Merge pull request #105049 from shyamjvs/automated-cherry-pick-of-#104833-upstream-release-1.22

Automated cherry pick of #104833 (1.22): Refine locking in API Priority and Fairness config controller

Kubernetes-commit: f3495a86d52772629c08298b4e41108ed0c940a0
This commit is contained in:
Kubernetes Publisher 2021-09-17 12:57:04 -07:00
parent 5ecefec6a4
commit a00f1af772
2 changed files with 8 additions and 8 deletions

8
go.mod
View File

@ -44,8 +44,8 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20210716001550-68328c152cca
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712
k8s.io/client-go v0.0.0-20210906194141-972da7b63619
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
@ -57,7 +57,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20210716001550-68328c152cca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/client-go => k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712
k8s.io/client-go => k8s.io/client-go v0.0.0-20210906194141-972da7b63619
k8s.io/component-base => k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5
)

8
go.sum
View File

@ -782,10 +782,10 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210716001550-68328c152cca h1:6AoteD5dwjeRYfsAH5Z8s52Xp2trgpH98OS7KwLRvBc=
k8s.io/api v0.0.0-20210716001550-68328c152cca/go.mod h1:FtqZiusVhnyM5jUPPFkDCU91OKo0sOpX9b9hotVGbIk=
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13 h1:Y40e5ho6n8KOvBCqdz/jm7ssKQyQLQdbZbC3lR9TaCU=
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b h1:17SqsVtOtUOshYV4NMXRibUOWKGQdoNlKujphTofAL8=
k8s.io/client-go v0.0.0-20210821161216-4d7bb68fef5b/go.mod h1:+NFu/lZU1mS8kUh1psD8heMubz2PQQUhnnXKflVMt0M=
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712 h1:zx3ZJS6iksKjoUoIs3BU1SRbRqoScwrUduK1IBBHtfc=
k8s.io/apimachinery v0.0.0-20210906153829-4a9e16b35712/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/client-go v0.0.0-20210906194141-972da7b63619 h1:A0k/2s4wZU8Q3s+ujv0lsQr/yrbJYhrJwVcbTaeZaU0=
k8s.io/client-go v0.0.0-20210906194141-972da7b63619/go.mod h1:gf9tfu7k5npUOyIjLHovSbyMfKfPHVcucjrO6hUbVT0=
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5 h1:w3QcpRkwFx6cGQ1RTgv7TtlODnpFm4zKQHyqp55/uH4=
k8s.io/component-base v0.0.0-20210821161839-63bef0cffea5/go.mod h1:yiDVpud5YoKPVU8ZRlcoMjOtPa+KxqZPLy7zv82Xgew=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=