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

Kubernetes-commit: 713b671a8a3fb526ba616a26953a91026c77611f
This commit is contained in:
Kubernetes Publisher 2022-12-07 03:55:25 +00:00
parent 3e8da9de27
commit 410701bd8c
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.19
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4
k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d
k8s.io/klog/v2 v2.80.1
)
@ -57,9 +57,8 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
k8s.io/client-go => k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d
)

8
go.sum
View File

@ -467,6 +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-20221208060720-07ac8fe9ce91 h1:xVuXb+iGNa+jCsqfhp0u1N4L+9vf7fF1gZJ6WZRnJU8=
k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk=
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7 h1:6WftyyXbOkaz1aO+YA8Z5774ZvYeQOUk1JUkvPaOTvE=
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4 h1:qpWxX9HVLEv3ZXLUUoCxV6sqQ/6kpiAJ+WfF5Tr1UbY=
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4/go.mod h1:FDjREoPmQrCli+ysHI2WFxvn4+R8vuDVkAF5LLumu+k=
k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d h1:N3ad8NSOang9kMhOCQxvoGqMPEoUP6QNJCYCfqBfHY8=
k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
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=