Merge pull request #115034 from MadhavJivrajani/release-1.24

[1.24] Cherry Pick of #114766: [Prepare for go1.20] *: Bump versions and fix tests

Kubernetes-commit: e0ad6bcbec848fb0f22b131e09cf04901479ccc7
This commit is contained in:
Kubernetes Publisher 2023-05-23 09:06:28 -07:00
commit b649f2f87b
2 changed files with 20 additions and 19 deletions

20
go.mod
View File

@ -30,11 +30,11 @@ require (
golang.org/x/sys v0.6.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20230513010431-273129d3df41
k8s.io/apimachinery v0.0.0-20230513005956-6b8613c85238
k8s.io/cli-runtime v0.0.0-20230513022531-3fdd45d20976
k8s.io/client-go v0.0.0-20230513011627-4aa6151f9be0
k8s.io/apimachinery v0.0.0-20230523181811-c2a4808f5a24
k8s.io/cli-runtime v0.0.0-20230523193626-ccc901523040
k8s.io/client-go v0.0.0-20230523183204-81aa33ed764a
k8s.io/component-base v0.0.0-20230513013335-a44de70c684d
k8s.io/component-helpers v0.0.0-20230513013758-fdff823a439e
k8s.io/component-helpers v0.0.0-20230523185505-1457e97f2113
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
k8s.io/metrics v0.0.0-20230513021943-054cd080f54c
@ -62,7 +62,7 @@ require (
github.com/google/btree v1.0.1 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@ -99,11 +99,11 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20230513010431-273129d3df41
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230513005956-6b8613c85238
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230513022531-3fdd45d20976
k8s.io/client-go => k8s.io/client-go v0.0.0-20230513011627-4aa6151f9be0
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230513005412-8fa86b356d9e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230523181811-c2a4808f5a24
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230523193626-ccc901523040
k8s.io/client-go => k8s.io/client-go v0.0.0-20230523183204-81aa33ed764a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230523181350-ca3263f5b6d0
k8s.io/component-base => k8s.io/component-base v0.0.0-20230513013335-a44de70c684d
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230513013758-fdff823a439e
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230523185505-1457e97f2113
k8s.io/metrics => k8s.io/metrics v0.0.0-20230513021943-054cd080f54c
)

19
go.sum
View File

@ -199,8 +199,9 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
@ -765,16 +766,16 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230513010431-273129d3df41 h1:ZVLDZRsnEta9r2uTv0BL0Hlajv/uJIyzuzQXh0UlxSI=
k8s.io/api v0.0.0-20230513010431-273129d3df41/go.mod h1:UNmQVpqkR1/w7J4+dzcMdgwWiOFA8rrndQiJF2omSDE=
k8s.io/apimachinery v0.0.0-20230513005956-6b8613c85238 h1:bjJ4pdt5Q6mFn/Mru5wash5sY4UxpSRCjj6RKbkIHaQ=
k8s.io/apimachinery v0.0.0-20230513005956-6b8613c85238/go.mod h1:Yyft+DTAvOmHyT332HkCMoTKroxYDEEx7NRLsdCYDoc=
k8s.io/cli-runtime v0.0.0-20230513022531-3fdd45d20976 h1:814xMFMn0XJQEPfD/V0Sof9eg9vhnXvmgcRVmrZENFo=
k8s.io/cli-runtime v0.0.0-20230513022531-3fdd45d20976/go.mod h1:5KYQO5clvb6bL8PMa+o+6qn6Tx3+daTKFH+5XjHKTrs=
k8s.io/client-go v0.0.0-20230513011627-4aa6151f9be0 h1:MQQVV4e9A3HPmSsJUBvohXxfXkKlZ+9j94yxahJSbKs=
k8s.io/client-go v0.0.0-20230513011627-4aa6151f9be0/go.mod h1:y89lD7T/84H03kEnj0nr3+mM3MdtsVHvuyrb1kRzu1k=
k8s.io/apimachinery v0.0.0-20230523181811-c2a4808f5a24 h1:XSwogI9WmO1ZYTB0fRdh1vwHpU5LQQrVGQf7SDoTlNw=
k8s.io/apimachinery v0.0.0-20230523181811-c2a4808f5a24/go.mod h1:kSzhCwldu9XB172NDdLffRN0sJ3x95RR7Bmyc4SHhs0=
k8s.io/cli-runtime v0.0.0-20230523193626-ccc901523040 h1:ylI6dQZaUrFGvddBM/vsjmhN18Jh+0vQHsvqTLKWzd4=
k8s.io/cli-runtime v0.0.0-20230523193626-ccc901523040/go.mod h1:UhWtnK0Nmdi1MqU5XV/ZTAcm5dqN/JU7xFnUoxODRw8=
k8s.io/client-go v0.0.0-20230523183204-81aa33ed764a h1:vWxH9Py3sF0NfoB1dqH/mdrLa8zvL2pdy3dRU1pbs/Y=
k8s.io/client-go v0.0.0-20230523183204-81aa33ed764a/go.mod h1:UnJ/FkbeIIjoGHjvqzwveDoSz9QyovHgLD/cIcwDK8c=
k8s.io/component-base v0.0.0-20230513013335-a44de70c684d h1:wgZ0R+LPm/St+wLy1yoJiQVXAOWM8Z64s5CnSGjoLqA=
k8s.io/component-base v0.0.0-20230513013335-a44de70c684d/go.mod h1:PeuDTf34sKSigngFgw5WovkWALnoUSsPDcP/lsq607A=
k8s.io/component-helpers v0.0.0-20230513013758-fdff823a439e h1:Tc4HI3kpkp+xeK8aAvnogWYna3zEM+OHcsAg1KAmISs=
k8s.io/component-helpers v0.0.0-20230513013758-fdff823a439e/go.mod h1:TIDL+hxx00I0mK8402LR95WoqwfzHFauzBiW7/dLfaE=
k8s.io/component-helpers v0.0.0-20230523185505-1457e97f2113 h1:V6CtHSOW3m3QgbyWd1r3Omw7GHR9LxVqZjczwLERpMQ=
k8s.io/component-helpers v0.0.0-20230523185505-1457e97f2113/go.mod h1:S6Lw2jcDiyNzG04oi6O1ROUOeFY5qPWcxYOGnfI0Nos=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=