From 041d3961b32a42202a811926cf77ab553db47c62 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 14 Jan 2022 20:32:16 -0800 Subject: [PATCH] Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03 --- go.mod | 7 ++----- go.sum | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f0cd56596f..6381301291 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,7 @@ go 1.16 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.7.0 - k8s.io/apimachinery v0.0.0 + k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b ) -replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery -) +replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b diff --git a/go.sum b/go.sum index 3ca47256f2..a9572e419d 100644 --- a/go.sum +++ b/go.sum @@ -221,6 +221,8 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b h1:FuYOQnw86QdxkdnbWG0qVV5E1ThtGNkvTH0nR0NelFs= +k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=