Merge pull request #106250 from ulucinar/bump-k-openapi-1.22

Manual cherry pick of kube-openapi changes for release-1.22

Kubernetes-commit: b01dafb504ddb82292ba0bd521a5053bacfebc05
This commit is contained in:
Kubernetes Publisher 2021-11-10 15:45:50 -08:00
parent cdccc7e212
commit 88cd337fec
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 go 1.16
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20211111072429-e757da007984
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20211111090130-612124330024
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20211111085822-ab85c431e29d
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20211111073002-79120fd8e4d1
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211111072429-e757da007984
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211111081309-b4975e494fe9
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20211111075125-362cd0f884a1
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211111090130-612124330024
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20211111075930-4c550c933ada
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211111085822-ab85c431e29d
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

12
go.sum
View File

@ -682,6 +682,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.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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211111073002-79120fd8e4d1 h1:XkAlEHTBxoVlZgFmxeR9n/Vgfqmhc8KWdSdy6SocIWM=
k8s.io/api v0.0.0-20211111073002-79120fd8e4d1/go.mod h1:Q/0gr4oQF02bhiZyT/tGHhqw5m8SbTX5HJfwakDtgHM=
k8s.io/apimachinery v0.0.0-20211111072429-e757da007984 h1:u5XdyAqEOwp6+EuYFY3FubMb73J8ombCb7CBXMIWi+E=
k8s.io/apimachinery v0.0.0-20211111072429-e757da007984/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0=
k8s.io/apiserver v0.0.0-20211111081309-b4975e494fe9/go.mod h1:LrVAUBMvI3qEznxQ/TCzociEtlHrNh3fTulJL4niXHE=
k8s.io/client-go v0.0.0-20211111075125-362cd0f884a1/go.mod h1:e/G3/IxLn3Snis124rTdYf0bKZpxYpUBdtdhJQR4Pik=
k8s.io/cloud-provider v0.0.0-20211111090130-612124330024 h1:eWxTvtdc/CXmsQ3bum5u3s4/+T5CvAIMXvVus95c9ko=
k8s.io/cloud-provider v0.0.0-20211111090130-612124330024/go.mod h1:ufmeVX9sdjdn2AYU96E8QnfjRh5MVVyuBChA7WZthMM=
k8s.io/component-base v0.0.0-20211111075930-4c550c933ada h1:Wx+RHtLIsOpruiMsjyPQq7MqFUpogdIq8tHNP4h/UfQ=
k8s.io/component-base v0.0.0-20211111075930-4c550c933ada/go.mod h1:stBb5xHNVzH6yeAeIYszubqOYvJ8haa4srYPQajyKMY=
k8s.io/controller-manager v0.0.0-20211111085822-ab85c431e29d h1:vkPkXdYiyW3qKoBoRcruCYWaAtbJfCy1+Khgye+BaBw=
k8s.io/controller-manager v0.0.0-20211111085822-ab85c431e29d/go.mod h1:Ln5xPe7zoC06JRT7ea94ovMMv+lLQ+6vpCGXJQOXMOY=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=