Merge pull request #105983 from jiahuif-forks/dep/bump-smd

Upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.0

Kubernetes-commit: 8e2d7a3d64976eb23e1a4fdc8c068f5210014da6
This commit is contained in:
Kubernetes Publisher 2021-11-03 15:24:32 -07:00
parent 707e40ab27
commit ee200c0120
2 changed files with 22 additions and 11 deletions

21
go.mod
View File

@ -5,18 +5,17 @@ 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-20211104003341-94020522c95c
k8s.io/cloud-provider v0.0.0-20211104010845-9163d112a2b1
k8s.io/controller-manager v0.0.0-20211104010726-13de39b6b1b6
)
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/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20211104003544-e423bf5bf942
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211104004913-250644e758ba
k8s.io/client-go => k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211104010845-9163d112a2b1
k8s.io/component-base => k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211104010726-13de39b6b1b6
)

12
go.sum
View File

@ -846,6 +846,18 @@ 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-20211104003544-e423bf5bf942 h1:mpDzWVE2CzzB+Gdd47PbeTXsSU6OMA46XtIOkw2I0QE=
k8s.io/api v0.0.0-20211104003544-e423bf5bf942/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ=
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
k8s.io/apiserver v0.0.0-20211104004913-250644e758ba/go.mod h1:PJopgqh9BzOSj8ctN1mWf19WWQSPyDU1cK7dRearz2w=
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M=
k8s.io/cloud-provider v0.0.0-20211104010845-9163d112a2b1 h1:pE2nTpJsjv40SErJ6kryb/rM+4HaAHDFOgKRCeyjuUs=
k8s.io/cloud-provider v0.0.0-20211104010845-9163d112a2b1/go.mod h1:RlLLdonS761X3oCb7FXTLYkDenQrLODhKsNmVAmkBTc=
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8 h1:L6x6ib3sOlNdnNBMWOfb+5sIExv6Fxo2gn3NIhoTePE=
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8/go.mod h1:i3cLNE42Rergf0WtAjvBXeMFMCiM70q8HHLQQjzt13Q=
k8s.io/controller-manager v0.0.0-20211104010726-13de39b6b1b6 h1:i+/QwPWamAeh1mATqqVOh52jihbt2LhcQUnjDUEjxDQ=
k8s.io/controller-manager v0.0.0-20211104010726-13de39b6b1b6/go.mod h1:VGHxYmoxSN8KWuoRqv7w7lRu6EeFZrYBoHtoNd2XRA4=
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.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=