Merge pull request #115051 from MadhavJivrajani/release-1.26

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

Kubernetes-commit: 4dfe380379bc9b3c39f8b041a95d12b4e6ac0cf3
This commit is contained in:
Kubernetes Publisher 2023-05-23 09:02:29 -07:00
commit 96b722d024
2 changed files with 17 additions and 17 deletions

16
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.19
require (
k8s.io/api v0.0.0-20230504161039-c9f384e22127
k8s.io/apimachinery v0.0.0-20230504155441-b207ce547a90
k8s.io/client-go v0.0.0-20230504163259-038b381bf689
k8s.io/code-generator v0.0.0-20230504152813-eec869e1b034
k8s.io/api v0.0.0-20230511174914-37e98ba1f0aa
k8s.io/apimachinery v0.0.0-20230523182049-b45fce6213dd
k8s.io/client-go v0.0.0-20230523184531-a3a549a55ac8
k8s.io/code-generator v0.0.0-20230523181521-d69bde275e5d
k8s.io/klog/v2 v2.80.1
)
@ -57,8 +57,8 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230504161039-c9f384e22127
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230504155441-b207ce547a90
k8s.io/client-go => k8s.io/client-go v0.0.0-20230504163259-038b381bf689
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230504152813-eec869e1b034
k8s.io/api => k8s.io/api v0.0.0-20230511174914-37e98ba1f0aa
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230523182049-b45fce6213dd
k8s.io/client-go => k8s.io/client-go v0.0.0-20230523184531-a3a549a55ac8
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230523181521-d69bde275e5d
)

18
go.sum
View File

@ -125,7 +125,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-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
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.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@ -467,14 +467,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
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.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230504161039-c9f384e22127 h1:U2jrPtLFbReRvbjjX0yP4v21gPYABHRAkcodM6Vq29E=
k8s.io/api v0.0.0-20230504161039-c9f384e22127/go.mod h1:PKBWfLQVUAXCXN4OieI6iUFDXYhNyU3yXNkUkYo+TEc=
k8s.io/apimachinery v0.0.0-20230504155441-b207ce547a90 h1:EG74qR81ZW0XSzMLAZlWqqFpb0WBglMPemY43aul0JI=
k8s.io/apimachinery v0.0.0-20230504155441-b207ce547a90/go.mod h1:HUvk6wrOP4v22AIYqeCGSQ6xWCHo41J9d6psb3temAg=
k8s.io/client-go v0.0.0-20230504163259-038b381bf689 h1:nuZEK9KQwglGLNIm+WTTHeAMbYmpm0qUTF/XAEF6yPI=
k8s.io/client-go v0.0.0-20230504163259-038b381bf689/go.mod h1:b8AZzZ+BgCsgon/cCCUhdpcFZCSXBVh5KR/16vfoGKg=
k8s.io/code-generator v0.0.0-20230504152813-eec869e1b034 h1:bI2NUtJkSn91ZwFgrqtbb7Dm66HOQ0NQ0F70i26S1QM=
k8s.io/code-generator v0.0.0-20230504152813-eec869e1b034/go.mod h1:iWTVFxfBX+RYe0bXjKqSM83KJF8eimor/izQInvq/60=
k8s.io/api v0.0.0-20230511174914-37e98ba1f0aa h1:GGj/JIMQiJgvmY7lJoYlq+TZeOjoYjAMnhz2oyZYpTI=
k8s.io/api v0.0.0-20230511174914-37e98ba1f0aa/go.mod h1:PKBWfLQVUAXCXN4OieI6iUFDXYhNyU3yXNkUkYo+TEc=
k8s.io/apimachinery v0.0.0-20230523182049-b45fce6213dd h1:MJg9RmLeP+AxCdHMIyA/45xI6v12V/pOlsEOywfzJ04=
k8s.io/apimachinery v0.0.0-20230523182049-b45fce6213dd/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/client-go v0.0.0-20230523184531-a3a549a55ac8 h1:nDcnLTNqLUw1fYxC9xSUVzK9vipMfYzkQVoyQbMKb34=
k8s.io/client-go v0.0.0-20230523184531-a3a549a55ac8/go.mod h1:lKaMsE8JvO6XadiF1ALec5rbon5Ieu6ya6ZWu/Z3X1I=
k8s.io/code-generator v0.0.0-20230523181521-d69bde275e5d h1:ID7WzQFf1C6+DygUy4PKCQ7rtSQWtTt33tV0ueJwW9k=
k8s.io/code-generator v0.0.0-20230523181521-d69bde275e5d/go.mod h1:iWTVFxfBX+RYe0bXjKqSM83KJF8eimor/izQInvq/60=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=