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 2064e72179
commit 362cd0f884
2 changed files with 8 additions and 5 deletions

9
go.mod
View File

@@ -30,8 +30,8 @@ require (
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.26.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20211111073002-79120fd8e4d1
k8s.io/apimachinery v0.0.0-20211111072429-e757da007984
k8s.io/klog/v2 v2.9.0
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/structured-merge-diff/v4 v4.1.2
@@ -39,7 +39,6 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20211111073002-79120fd8e4d1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211111072429-e757da007984
)

4
go.sum
View File

@@ -444,6 +444,10 @@ 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-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/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=