upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: fa2db4831f720fcc31139a026cb012130058bca3
This commit is contained in:
Jiahui Feng
2022-01-14 10:30:23 -08:00
committed by Kubernetes Publisher
parent 558b220907
commit a33ed41d67
2 changed files with 6 additions and 9 deletions

11
go.mod
View File

@@ -30,15 +30,16 @@ require (
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.26.0
k8s.io/api v0.0.0-20211213212539-d5ade40cd9be
k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/klog/v2 v2.9.0
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/structured-merge-diff/v4 v4.1.2
sigs.k8s.io/structured-merge-diff/v4 v4.2.1
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211213212539-d5ade40cd9be
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
)

4
go.sum
View File

@@ -444,10 +444,6 @@ 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.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211213212539-d5ade40cd9be h1:rGRc4cWqJfb/URjMeBwh7TTIBo7PFfeyQc7JnMUr2kU=
k8s.io/api v0.0.0-20211213212539-d5ade40cd9be/go.mod h1:gr992K7E98YJ478akVvIIyHNcTk98jjjd3Kx5AFX2o8=
k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05 h1:T5k4aJVbdpgeGkkGsqU/vbE3IrAXTD2jcbk3PK0+ypQ=
k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=