Merge pull request #115050 from MadhavJivrajani/release-1.25

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

Kubernetes-commit: 1b9137732b227f6f97aeccaab179435bbf8a0b1f
This commit is contained in:
Kubernetes Publisher 2023-05-23 10:10:26 -07:00
commit 3420e4c53d
2 changed files with 13 additions and 13 deletions

12
go.mod
View File

@ -6,9 +6,9 @@ go 1.19
require ( require (
k8s.io/api v0.0.0-20230506010734-a66c7f8978d7 k8s.io/api v0.0.0-20230506010734-a66c7f8978d7
k8s.io/apimachinery v0.0.0-20230506005852-75464993cc05 k8s.io/apimachinery v0.0.0-20230523181929-844b4ec4956b
k8s.io/client-go v0.0.0-20230506012701-d32b1d7c08e5 k8s.io/client-go v0.0.0-20230523183903-5ddf75f6a2b2
k8s.io/code-generator v0.0.0-20230506005438-21e5dbb468d7 k8s.io/code-generator v0.0.0-20230523181434-6fcc9f28ff8b
k8s.io/klog/v2 v2.70.1 k8s.io/klog/v2 v2.70.1
) )
@ -60,7 +60,7 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20230506010734-a66c7f8978d7 k8s.io/api => k8s.io/api v0.0.0-20230506010734-a66c7f8978d7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230506005852-75464993cc05 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230523181929-844b4ec4956b
k8s.io/client-go => k8s.io/client-go v0.0.0-20230506012701-d32b1d7c08e5 k8s.io/client-go => k8s.io/client-go v0.0.0-20230523183903-5ddf75f6a2b2
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230506005438-21e5dbb468d7 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230523181434-6fcc9f28ff8b
) )

14
go.sum
View File

@ -130,7 +130,7 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= 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/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@ -472,12 +472,12 @@ 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= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230506010734-a66c7f8978d7 h1:4Qu+ilKDiu8UO7P+6xrtwcEdoqkVzWYJI02ctJcCa2U= k8s.io/api v0.0.0-20230506010734-a66c7f8978d7 h1:4Qu+ilKDiu8UO7P+6xrtwcEdoqkVzWYJI02ctJcCa2U=
k8s.io/api v0.0.0-20230506010734-a66c7f8978d7/go.mod h1:7+C3E7ExDKC8ZFfsNe1oK9hXOTsJFnPbtKsK6k4rI6E= k8s.io/api v0.0.0-20230506010734-a66c7f8978d7/go.mod h1:7+C3E7ExDKC8ZFfsNe1oK9hXOTsJFnPbtKsK6k4rI6E=
k8s.io/apimachinery v0.0.0-20230506005852-75464993cc05 h1:034ZEBiA099Vnr3F7pqVRl3Y0LR2AAGhI3l+kTDB2VU= k8s.io/apimachinery v0.0.0-20230523181929-844b4ec4956b h1:TpcbtcNCYpyPLJAwE1eaWO9MUq1Aj0FDM6T+Badhhp4=
k8s.io/apimachinery v0.0.0-20230506005852-75464993cc05/go.mod h1:PJ+6cm50BMETqCCJx1RXQIXaq937SUdAq2vVKCGDZXU= k8s.io/apimachinery v0.0.0-20230523181929-844b4ec4956b/go.mod h1:IFwbcNi3gKkfDhuy0VYu3+BwbxbiIov3p6FR8ge1Epc=
k8s.io/client-go v0.0.0-20230506012701-d32b1d7c08e5 h1:+AGdPQWkALVEXk8xDBaGascgEVrMAQrQ55CdNYuWyfA= k8s.io/client-go v0.0.0-20230523183903-5ddf75f6a2b2 h1:J9PXcrME5XMaeiYW/+GFooqIoNx2ymGrQP2c6S7fiaw=
k8s.io/client-go v0.0.0-20230506012701-d32b1d7c08e5/go.mod h1:C5CHkUuLzEP+y1ZUI/yg6C00J66PKpZAWCtCZJv5sj8= k8s.io/client-go v0.0.0-20230523183903-5ddf75f6a2b2/go.mod h1:hY5DFTuHNEh6EqRqQChVMsibWIArawNWITDWKyFXLmI=
k8s.io/code-generator v0.0.0-20230506005438-21e5dbb468d7 h1:hv0wcO0fYH+qtzFnkC0juq5iCoCaXniL12Nh/5XDPP0= k8s.io/code-generator v0.0.0-20230523181434-6fcc9f28ff8b h1:GPeIDXbd0qq5Oqt+oQgEBM3wW6EGU/5ip0qbAeVUm08=
k8s.io/code-generator v0.0.0-20230506005438-21e5dbb468d7/go.mod h1:FA5a4rk4tMTCgmiDeNdRjml+AGvm72SwZYwD5lBrezY= k8s.io/code-generator v0.0.0-20230523181434-6fcc9f28ff8b/go.mod h1:FA5a4rk4tMTCgmiDeNdRjml+AGvm72SwZYwD5lBrezY=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=