From 793a99fc153edafd4c61ba1e0301d86801e3653f Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 3 Nov 2021 15:24:32 -0700 Subject: [PATCH] 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 --- go.mod | 17 ++++++++--------- go.sum | 8 ++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index efb025bd..47f84428 100644 --- a/go.mod +++ b/go.mod @@ -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-20211104003544-e423bf5bf942 + k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c + k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 + k8s.io/code-generator v0.0.0-20211104003136-1003036828ea k8s.io/klog/v2 v2.30.0 ) 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-20211104003544-e423bf5bf942 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c + k8s.io/client-go => k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211104003136-1003036828ea ) diff --git a/go.sum b/go.sum index 3a2877d2..3f484fd7 100644 --- a/go.sum +++ b/go.sum @@ -606,6 +606,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-20211104003544-e423bf5bf942 h1:mpDzWVE2CzzB+Gdd47PbeTXsSU6OMA46XtIOkw2I0QE= +k8s.io/api v0.0.0-20211104003544-e423bf5bf942/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo= +k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ= +k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto= +k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 h1:5555+BsEXvnsDKnNtMm4pL5Jf9x4HBN96ZZ9cQ5Wt9c= +k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M= +k8s.io/code-generator v0.0.0-20211104003136-1003036828ea h1:glm6vZa5MEG12+JH4Cpkm6vhOQnuQuHHSji1setyjxw= +k8s.io/code-generator v0.0.0-20211104003136-1003036828ea/go.mod h1:wgD40ts/jbentZZcVvzzscrjJ2IoTSNJXfeVJxytQvU= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=