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 2eae75b07f
commit 2308bba01c
2 changed files with 16 additions and 9 deletions

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20220114212057-37c9308dad1e
k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b
k8s.io/client-go v0.0.0-20220114212508-092b54e6e535
k8s.io/code-generator v0.0.0-20220114211509-46b6323b57a2
k8s.io/klog/v2 v2.40.1
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20220114212057-37c9308dad1e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b
k8s.io/client-go => k8s.io/client-go v0.0.0-20220114212508-092b54e6e535
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220114211509-46b6323b57a2
)

8
go.sum
View File

@ -614,6 +614,14 @@ 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/client-go v0.0.0-20220114212508-092b54e6e535 h1:/CkYObh8SlkqIXC+PTHuj3TaXyAnHhON6XQB4typ9y4=
k8s.io/client-go v0.0.0-20220114212508-092b54e6e535/go.mod h1:QpOMWG81SHGTz7f5+sGRm2wjSzceou61sBI922IVyr0=
k8s.io/code-generator v0.0.0-20220114211509-46b6323b57a2 h1:O2FDwuvLuvoSj/9cI/DzfyRKz+5S7/wc1X6NeDEhuNM=
k8s.io/code-generator v0.0.0-20220114211509-46b6323b57a2/go.mod h1:13z1JFp2qjcsKGe8Kp3NutZ+fCwNjAsJi5y3sIjOoj0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=