kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23 

Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03
This commit is contained in:
Kubernetes Publisher 2022-01-14 20:32:16 -08:00
parent bee18e257e
commit 0ac923cbb2
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b
k8s.io/cloud-provider v0.0.0-20220115070935-4fff19bf8c31
k8s.io/controller-manager v0.0.0-20220115070555-da1b9d4e28cc
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20220115053135-041d3961b32a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220115061848-e5cb42d4e3a5
k8s.io/client-go => k8s.io/client-go v0.0.0-20220115055430-857d6f1290cb
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220115070935-4fff19bf8c31
k8s.io/component-base => k8s.io/component-base v0.0.0-20220115060153-8709da51852e
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220115060441-9df7ea485b83
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220115070555-da1b9d4e28cc
)

13
go.sum
View File

@ -855,6 +855,19 @@ 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-20220115053135-041d3961b32a h1:qMFYRoetYNi+UlzPwQ8awyHErC6L1jy9vHoSYbRaJ1w=
k8s.io/api v0.0.0-20220115053135-041d3961b32a/go.mod h1:QPHbvCbJa8i7XqwifOsti9gUWe8bORsOpFvi3DNfa1w=
k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b h1:FuYOQnw86QdxkdnbWG0qVV5E1ThtGNkvTH0nR0NelFs=
k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8=
k8s.io/apiserver v0.0.0-20220115061848-e5cb42d4e3a5/go.mod h1:FrbCc0A6S4Syo+UeuMVzCODbfK/4yub7rbQPYKCfVyQ=
k8s.io/client-go v0.0.0-20220115055430-857d6f1290cb/go.mod h1:uS5ctICPNIyPD9wuFlOAQKMjA7deau43xi/HTZam3ro=
k8s.io/cloud-provider v0.0.0-20220115070935-4fff19bf8c31 h1:AvTqaV+5v7lV35Q9Ho5jNUzuPQrZ7xO3RmEAH+rAZx0=
k8s.io/cloud-provider v0.0.0-20220115070935-4fff19bf8c31/go.mod h1:SZZrKDvEa2tNG3v0DiNlYweqwYYiz5p1fJqpU+FL86k=
k8s.io/component-base v0.0.0-20220115060153-8709da51852e h1:u1/FzacvHtWmKMIv0p1pTNdCNdKBdsvjrO8E+bmzJCs=
k8s.io/component-base v0.0.0-20220115060153-8709da51852e/go.mod h1:5dp0WPK6FcP71x+Hp5Pgl2iVz1AFrgw1QepeTjlR9rs=
k8s.io/component-helpers v0.0.0-20220115060441-9df7ea485b83/go.mod h1:n+oQRpjC6/NHLLQ3fXkWTwpkjhDu1Ieh0mv7PWjsv/E=
k8s.io/controller-manager v0.0.0-20220115070555-da1b9d4e28cc h1:zRo1ZT3H16xaYvBqFc6R981Fn1uvT4EY8GNkQM2USEc=
k8s.io/controller-manager v0.0.0-20220115070555-da1b9d4e28cc/go.mod h1:o8T2fRmv8oxjtFnlJwsbomEF/j1MRc2vm1rZ4k2ye4s=
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=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=