Merge pull request #103930 from cheftako/automated-cherry-pick-of-#103895-upstream-release-1.22

Automated cherry pick of #103895: Update to using apiserver-network-proxy v1.22

Kubernetes-commit: 762044d22bdd90d0e897d47367d948d2c4a123a7
This commit is contained in:
Kubernetes Publisher 2021-07-28 07:57:35 -07:00
parent 80218ae5b4
commit 513f796812
2 changed files with 22 additions and 11 deletions

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/cloud-provider v0.0.0-20210728191934-ee09ea072600
k8s.io/controller-manager v0.0.0-20210728191715-e807fd69dd02
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20210716001550-68328c152cca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210728184902-ddc793b7c41e
k8s.io/client-go => k8s.io/client-go v0.0.0-20210722183257-1e037e8d981a
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210728191934-ee09ea072600
k8s.io/component-base => k8s.io/component-base v0.0.0-20210722183836-c8cabcb7d39d
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210728191715-e807fd69dd02
)

12
go.sum
View File

@ -681,6 +681,18 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
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=
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/apiserver v0.0.0-20210728184902-ddc793b7c41e/go.mod h1:lE1jOtwoETq5rdNqbD5XH3oX5Bz16QlB2k8UpWGPfzM=
k8s.io/client-go v0.0.0-20210722183257-1e037e8d981a/go.mod h1:J0QracdtAUnDf3NWbMdpCV5lAt8WuAZFqSTcCiUeMsY=
k8s.io/cloud-provider v0.0.0-20210728191934-ee09ea072600 h1:1w3rKEtuBkMiRFgLMBvoZRB+V6Byf8InslBb0X3YyWQ=
k8s.io/cloud-provider v0.0.0-20210728191934-ee09ea072600/go.mod h1:jBDSleRk7FAr7gKU7TcZeWxfiJEy0Pg6KXMhpwfCg6o=
k8s.io/component-base v0.0.0-20210722183836-c8cabcb7d39d h1:/mcNtizH/7LVNF658fJWKe6AJjl2EnTLLoJnzk9BCWQ=
k8s.io/component-base v0.0.0-20210722183836-c8cabcb7d39d/go.mod h1:LBVnEifw+SvQx2si1RCpd0WVE198EULnwqnMg0QBBQQ=
k8s.io/controller-manager v0.0.0-20210728191715-e807fd69dd02 h1:XhxlkVYnfiufzyBe1/ELateTky1Cpk16+hWN8ncADoE=
k8s.io/controller-manager v0.0.0-20210728191715-e807fd69dd02/go.mod h1:PdoMY+0XXVIOQCaycBeT8HdxQE56pBRZIA0/mJDDZ44=
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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=