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 #107568 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.22 

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

Kubernetes-commit: 487eef699dc8ad07106876e7fb045962606035ec
This commit is contained in:
Kubernetes Publisher 2022-01-14 23:06:15 -08:00
parent ba8437fd76
commit a9224d3370
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
go.mod
View File

@ -5,18 +5,19 @@ module k8s.io/kube-controller-manager
go 1.16 go 1.16
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20220115140403-492f5ad5072d
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20220115140218-14b4c9f278af
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20220115132223-0b924f4f7b63
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220115133942-2bbf3fd6257e
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20220115132708-74d341032456
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220115140403-492f5ad5072d
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20220115133244-2cf290fc3424
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220115140218-14b4c9f278af
k8s.io/kube-controller-manager => ../kube-controller-manager
) )
replace k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220115133409-51163e328dab

12
go.sum
View File

@ -682,6 +682,18 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.0.0-20220115132223-0b924f4f7b63 h1:ARkTMQaUQg/XAxZGClgPO8jLBGe+0vyHOzkv1klocn4=
k8s.io/api v0.0.0-20220115132223-0b924f4f7b63/go.mod h1:VZ3awwdNsOtdAUAYPvruiFtrH/OD4gT5qmZHaQmXgxY=
k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0 h1:SoF7jCfsIaGo2y+PiJGjFnRMeGh4zO4aGEYc0IVGAu4=
k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU=
k8s.io/apiserver v0.0.0-20220115133942-2bbf3fd6257e/go.mod h1:sirt6mWMpl6WYNXc12gE+eSbCuTeUVOzEZOAx7D29FA=
k8s.io/client-go v0.0.0-20220115132708-74d341032456/go.mod h1:NYI+N6XGfzp0WaUrQoLAImOjemBZsTuMwmU2XBA/VqQ=
k8s.io/cloud-provider v0.0.0-20220115140403-492f5ad5072d h1:ALa2LlvmMeAtzhMm2fhVM8BvOIn3SKc4tAfSpqHuOLA=
k8s.io/cloud-provider v0.0.0-20220115140403-492f5ad5072d/go.mod h1:MSqgpSpc3JvRG4WhS8Z9FEC/jt3BYeGcVAYjcDqf1Cc=
k8s.io/component-base v0.0.0-20220115133244-2cf290fc3424 h1:fu6n0571tQ3hdH7TDXysWrTPdjXf/lL46r8Uo/4X0TA=
k8s.io/component-base v0.0.0-20220115133244-2cf290fc3424/go.mod h1:WXqQ7RykxM3EhMl5lqO3Awu3tzBd1RxKTiVTjkV7diw=
k8s.io/controller-manager v0.0.0-20220115140218-14b4c9f278af h1:vM3K2r+vUa3sbhdlkyoAF/9DO0bOwWZ6XhBHnWNwyVQ=
k8s.io/controller-manager v0.0.0-20220115140218-14b4c9f278af/go.mod h1:q6PCgYncBe5dm9jTiArVkdpZD9OZXPEtbXRQMZB0uFY=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=