Skip to content

Commit 6727416

Browse files
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
1 parent 9b6ef19 commit 6727416

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

go.mod

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ require (
88
github.com/gogo/protobuf v1.3.2
99
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
1010
google.golang.org/grpc v1.38.0
11-
k8s.io/api v0.0.0
12-
k8s.io/apimachinery v0.0.0
13-
k8s.io/component-base v0.0.0
11+
k8s.io/api v0.0.0-20211104003544-e423bf5bf942
12+
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
13+
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
1414
)
1515

1616
replace (
17-
k8s.io/api => ../api
18-
k8s.io/apimachinery => ../apimachinery
19-
k8s.io/client-go => ../client-go
20-
k8s.io/component-base => ../component-base
21-
k8s.io/kubelet => ../kubelet
17+
k8s.io/api => k8s.io/api v0.0.0-20211104003544-e423bf5bf942
18+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
19+
k8s.io/client-go => k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
20+
k8s.io/component-base => k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
2221
)

go.sum

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,13 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
766766
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
767767
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
768768
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
769+
k8s.io/api v0.0.0-20211104003544-e423bf5bf942 h1:mpDzWVE2CzzB+Gdd47PbeTXsSU6OMA46XtIOkw2I0QE=
770+
k8s.io/api v0.0.0-20211104003544-e423bf5bf942/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
771+
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ=
772+
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
773+
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M=
774+
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8 h1:L6x6ib3sOlNdnNBMWOfb+5sIExv6Fxo2gn3NIhoTePE=
775+
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8/go.mod h1:i3cLNE42Rergf0WtAjvBXeMFMCiM70q8HHLQQjzt13Q=
769776
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
770777
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
771778
k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=

0 commit comments

Comments
 (0)