Merge pull request #106257 from ulucinar/bump-k-openapi-1.20

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

Kubernetes-commit: 712d74c900f4eeae81ead1a7207f21efc2cd6a1b
This commit is contained in:
Kubernetes Publisher 2021-11-10 14:46:36 -08:00
parent 5f9524ea31
commit 7873ea42e5
2 changed files with 30 additions and 16 deletions

31
go.mod
View file

@ -34,28 +34,27 @@ require (
github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/api v0.0.0-20211111072721-19b6426640e4
k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac
k8s.io/cli-runtime v0.0.0-20211111084236-d12f3d0a40d9
k8s.io/client-go v0.0.0-20211111073827-7e4462aced1f
k8s.io/component-base v0.0.0-20211111075749-f6c165ebdcbc
k8s.io/component-helpers v0.0.0-20211111080050-92f9e16a083d
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20211111083925-a55624006835
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20211111072721-19b6426640e4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211111084236-d12f3d0a40d9
k8s.io/client-go => k8s.io/client-go v0.0.0-20211111073827-7e4462aced1f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211111071744-9814fff3d840
k8s.io/component-base => k8s.io/component-base v0.0.0-20211111075749-f6c165ebdcbc
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211111080050-92f9e16a083d
k8s.io/metrics => k8s.io/metrics v0.0.0-20211111083925-a55624006835
)

15
go.sum
View file

@ -625,6 +625,19 @@ 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-20211111072721-19b6426640e4 h1:D9Z/HG2NIPFpYv9zp641OS8DgY5Q2wIWonrahse5j2o=
k8s.io/api v0.0.0-20211111072721-19b6426640e4/go.mod h1:lRybyiA880LjD6Su1v2QxF/ca5IB6jdxV1AER2UUkVs=
k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac h1:6dWXjsoOB+DTM+s5iSXGZfxHzUq0TnDRss77HSKwjbc=
k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac/go.mod h1:4KFiDSxCoGviCiRk9kTXIROsIf4VSGkVYjVJjJln3pg=
k8s.io/cli-runtime v0.0.0-20211111084236-d12f3d0a40d9 h1:sbPHuj4m40yb/A7Q3SjETr58qYoEiAbs4MDIV+HkH10=
k8s.io/cli-runtime v0.0.0-20211111084236-d12f3d0a40d9/go.mod h1:q0kuOrU9vC9kH35aPCs5J+iZlR521IAt0tjXZ0JlaHc=
k8s.io/client-go v0.0.0-20211111073827-7e4462aced1f h1:58hKlHpmzq8Vu8rzmPLvVcvbYgnXzmv8UjUX93P5+XQ=
k8s.io/client-go v0.0.0-20211111073827-7e4462aced1f/go.mod h1:+EnyNE//BCZP09e+E8FcYF8OfhuS8FPqyimV2guYysU=
k8s.io/code-generator v0.0.0-20211111071744-9814fff3d840/go.mod h1:MW85KuhTjX9nzhFYpRqUOYh4et0xeEBHTEjwBzFYGaM=
k8s.io/component-base v0.0.0-20211111075749-f6c165ebdcbc h1:e2tYAVbAWAmSqvoo1/mkLStSLHWEsHefmp+upUMlQts=
k8s.io/component-base v0.0.0-20211111075749-f6c165ebdcbc/go.mod h1:KajhZwlao8f/SkJlVcSy4y+wns1mv0MNEiPeH8AvawE=
k8s.io/component-helpers v0.0.0-20211111080050-92f9e16a083d h1:rD31SyMIvlJbmwl956P6V5sdhGO4jkgzpUBDGgpF8AU=
k8s.io/component-helpers v0.0.0-20211111080050-92f9e16a083d/go.mod h1:zQAm/VWNRTqoEzGhmZ8FA2U4wb5WHQZkmf4nZC3YMJU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -633,6 +646,8 @@ k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513 h1:pbudjNtv90nOgR0/DUhPwKHnQ55Khz8+sNhJBIK7A5M=
k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/metrics v0.0.0-20211111083925-a55624006835 h1:uDptPHeWPbysljfJQ4/K5kKyVBsDRkzMeZbUresR/HE=
k8s.io/metrics v0.0.0-20211111083925-a55624006835/go.mod h1:lVjkWgMKUOTX9+hj40f+PPtH9AUSlZ5PvWMRWKmGQNY=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=