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 #106661 from liggitt/automated-cherry-pick-of-#106660-upstream-release-1.23 

Automated cherry pick of #106660: Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: 724289524084f6edbbe53e31d2c6e636343fdebb
This commit is contained in:
Kubernetes Publisher 2021-12-01 18:49:32 -08:00
parent 214a9f8da2
commit 9e7ac3679a
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-20211203085806-1d209c836ad2
k8s.io/cloud-provider v0.0.0-20211203103554-9db4ee2952fb
k8s.io/controller-manager v0.0.0-20211203103218-e2901f12523c
)
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-20211203090506-2893881082f7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211203094338-ee8752354392
k8s.io/client-go => k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211203103554-9db4ee2952fb
k8s.io/component-base => k8s.io/component-base v0.0.0-20211203092803-3e2c2067e1c9
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211203093057-f6f097a4db8d
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211203103218-e2901f12523c
)

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-20211203090506-2893881082f7 h1:uOyVSOPIZ3n17DT7fbpRIWa8tnwXcq81Q6Ri7ITzYsA=
k8s.io/api v0.0.0-20211203090506-2893881082f7/go.mod h1:sSZUBf47O72sm2TBpsmNK7PMBvL3qWQRzlPt0Uly0Q0=
k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2 h1:KQpp3OaTtqoEEgfEX55D5+FQ5aqOb1/YcDoY5eCsAbU=
k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/apiserver v0.0.0-20211203094338-ee8752354392/go.mod h1:Rb9gPsd/mWPp+vcMMxU6mzIlwi9TYBXVZUQzcOu7JYU=
k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a/go.mod h1:A0Qu03G2szmnUgufFw7h1fDqvdn87Y2zjNQBD/zL3yE=
k8s.io/cloud-provider v0.0.0-20211203103554-9db4ee2952fb h1:KFjDqxmpflIUGd668YXhFL38nnPfqQrrv4SDD8jDywc=
k8s.io/cloud-provider v0.0.0-20211203103554-9db4ee2952fb/go.mod h1:kXqnXdczipptTLdrQSc5sF0KQpLVbL7GiPHCAw6R3zY=
k8s.io/component-base v0.0.0-20211203092803-3e2c2067e1c9 h1:xsIvwG34dbQr+gJD3R0iyilKdA/9H2s8qkUDZ1JwjFg=
k8s.io/component-base v0.0.0-20211203092803-3e2c2067e1c9/go.mod h1:LouipoY6pab2NTiQyJkDMgIvs/fqPCNQMLKxA2bv7Qc=
k8s.io/component-helpers v0.0.0-20211203093057-f6f097a4db8d/go.mod h1:lD/YM+6uekzFt4H4R0AkBWcJ37gAlhylscYBKX5YcmA=
k8s.io/controller-manager v0.0.0-20211203103218-e2901f12523c h1:DWG89wZE+R4M2ASH4C648uqM6dyuzRRDd3Un7dbsEbs=
k8s.io/controller-manager v0.0.0-20211203103218-e2901f12523c/go.mod h1:fk5ry1ZoAcnuYm3VskwtzxOiwFxVzO1Kh9Zdx9zR+6A=
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=