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 #107565 from jiahuif-forks/deps/structured-merged-diff 

upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: cf18d80d035780739575b8cc889e8f26bf36779f
This commit is contained in:
Kubernetes Publisher 2022-01-14 12:32:26 -08:00
parent 8413747a93
commit 772fb8f1aa
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-20220114211744-3c16f3dcfb0b
k8s.io/cloud-provider v0.0.0-20220114220639-1bd3c6f2575d
k8s.io/controller-manager v0.0.0-20220114220459-86855eb8dfd4
)
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-20220114212057-37c9308dad1e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220114213809-d623d4135926
k8s.io/client-go => k8s.io/client-go v0.0.0-20220114212508-092b54e6e535
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220114220639-1bd3c6f2575d
k8s.io/component-base => k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220114213410-6878be98cbd9
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220114220459-86855eb8dfd4
)

13
go.sum
View File

@ -853,6 +853,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-20220114212057-37c9308dad1e h1:yq1koxef1IPugvWJ0datOgWkA3bq6EQ/laIdBCRNV2M=
k8s.io/api v0.0.0-20220114212057-37c9308dad1e/go.mod h1:ydI/EZB8sQSGGgqIugVCax6qT4v8+NZ6Hbduo30cjbo=
k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b h1:7lh+0FnYetRD5shepu42q+Su/LHlUy2VgoeoQN1sd3Y=
k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b/go.mod h1:v8xabFQhCZrrX2Lm1DcO0GldEoXSxCi8KODudZ/jv5s=
k8s.io/apiserver v0.0.0-20220114213809-d623d4135926/go.mod h1:CP8wBJ0Wfh17oLHWQaftKgW1jJiUnOB4KN4TpW9vTSc=
k8s.io/client-go v0.0.0-20220114212508-092b54e6e535/go.mod h1:QpOMWG81SHGTz7f5+sGRm2wjSzceou61sBI922IVyr0=
k8s.io/cloud-provider v0.0.0-20220114220639-1bd3c6f2575d h1:w1Iv+C/HgIAAtWkhMp2/xYqkYRkLVN21On5dy0fPnpU=
k8s.io/cloud-provider v0.0.0-20220114220639-1bd3c6f2575d/go.mod h1:onLs+6Uftu6SYNshMYQRWN4eUlKnVfjctXHYQCIM9sU=
k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5 h1:yvZJ8NYVgrxEsLil/oOJ7MKQxby9iBDjQ/rhICoWVG0=
k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5/go.mod h1:+7xa73sNdCgJ/cOHyZGnz7O9+gP7EcnPUtd8b9B5Xi4=
k8s.io/component-helpers v0.0.0-20220114213410-6878be98cbd9/go.mod h1:ie/gT24Xgdy/UjXRGKf+tv/Kew6/2fWrfWW2YjVxmS8=
k8s.io/controller-manager v0.0.0-20220114220459-86855eb8dfd4 h1:EyXohLMf3lJOLbPC3UYseW+xNslLrltZOsIz8i3iKaA=
k8s.io/controller-manager v0.0.0-20220114220459-86855eb8dfd4/go.mod h1:sq+BbRkSui+BhjiiwNv+Su0NmUQj0aZxBsnoawJ2Cb4=
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=