Skip to content

Commit 41e325c

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 6e621d4 commit 41e325c

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

go.mod

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ go 1.16
77
require (
88
github.com/gogo/protobuf v1.3.2
99
github.com/stretchr/testify v1.7.0
10-
k8s.io/api v0.0.0
11-
k8s.io/apimachinery v0.0.0
12-
k8s.io/client-go v0.0.0
13-
k8s.io/code-generator v0.0.0
10+
k8s.io/api v0.0.0-20211104003544-e423bf5bf942
11+
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
12+
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
13+
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea
1414
)
1515

1616
replace (
17-
k8s.io/api => ../api
18-
k8s.io/apimachinery => ../apimachinery
19-
k8s.io/client-go => ../client-go
20-
k8s.io/code-generator => ../code-generator
21-
k8s.io/metrics => ../metrics
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/code-generator => k8s.io/code-generator v0.0.0-20211104003136-1003036828ea
2221
)

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
603603
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
604604
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
605605
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
606+
k8s.io/api v0.0.0-20211104003544-e423bf5bf942 h1:mpDzWVE2CzzB+Gdd47PbeTXsSU6OMA46XtIOkw2I0QE=
607+
k8s.io/api v0.0.0-20211104003544-e423bf5bf942/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
608+
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ=
609+
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
610+
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 h1:5555+BsEXvnsDKnNtMm4pL5Jf9x4HBN96ZZ9cQ5Wt9c=
611+
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M=
612+
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea h1:glm6vZa5MEG12+JH4Cpkm6vhOQnuQuHHSji1setyjxw=
613+
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea/go.mod h1:wgD40ts/jbentZZcVvzzscrjJ2IoTSNJXfeVJxytQvU=
606614
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
607615
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
608616
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

0 commit comments

Comments
 (0)