Merge remote-tracking branch 'origin/master' into release-1.27

Kubernetes-commit: 0d6e44998fe1c0a21d0aba1327f55d60ae8a7c2d
This commit is contained in:
Kubernetes Publisher 2023-03-27 16:26:19 +00:00
parent eb525adac6
commit bfdf083914
2 changed files with 16 additions and 9 deletions

17
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.20 go 1.20
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20230327181953-5b93db5944f3
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20230327183152-559da627e81e
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20230327162619-6533006896fa
k8s.io/klog/v2 v2.90.1 k8s.io/klog/v2 v2.90.1
) )
@ -58,9 +58,8 @@ require (
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20230327181953-5b93db5944f3
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20230327183152-559da627e81e
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230327162619-6533006896fa
k8s.io/sample-controller => ../sample-controller
) )

8
go.sum
View File

@ -472,6 +472,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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
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-20230327181953-5b93db5944f3 h1:XvTPeYtRRACrKZGRDkpHMRXq/xT9/cWZPv+Sx7t4HHU=
k8s.io/api v0.0.0-20230327181953-5b93db5944f3/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
k8s.io/client-go v0.0.0-20230327183152-559da627e81e h1:TlvjcU/+pjDx/uP3Dg06MaFcB3MhlBGi6ieut7uAt7E=
k8s.io/client-go v0.0.0-20230327183152-559da627e81e/go.mod h1:E+a5NHIY/xgy5Gv8qVtZIhbNtrYNmezoWCHejv0GBO4=
k8s.io/code-generator v0.0.0-20230327162619-6533006896fa h1:VWQJOJWMyEAIDkij54pPqRW7+c6krFTEoiVG9DfIA0s=
k8s.io/code-generator v0.0.0-20230327162619-6533006896fa/go.mod h1:iWtpm0ZMG6Gc4daWfITDSIu+WFhFJArYDhj242zcbnY=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= 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/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= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=