From fd70eb81d6c754bf4a46a1ee078460d17fe024bd Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 11 Feb 2021 17:01:23 -0800 Subject: [PATCH] Update sigs.k8s.io/structured-merge-diff to v4.0.3 Kubernetes-commit: 707612732a7b43aa12e329b0cd6308116ff4af4d --- go.mod | 17 +++++++++-------- go.sum | 6 ++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 58dc2f1c..8bc04ce7 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ module k8s.io/sample-controller go 1.15 require ( - k8s.io/api v0.0.0-20210206010904-48bd8381a38a - k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e - k8s.io/client-go v0.0.0-20210206011112-100613764a76 - k8s.io/code-generator v0.0.0-20210206010601-575533eae677 + 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/klog/v2 v2.5.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210206010904-48bd8381a38a - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e - k8s.io/client-go => k8s.io/client-go v0.0.0-20210206011112-100613764a76 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210206010601-575533eae677 + 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 ) diff --git a/go.sum b/go.sum index 6fe413a7..b0688db8 100644 --- a/go.sum +++ b/go.sum @@ -423,10 +423,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-20210206010904-48bd8381a38a/go.mod h1:yJXUR00OAZb/k9uZJywbkX/aSggd80m8p8XMVzc+4u8= -k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e/go.mod h1:usCLrfBNFPxV+npBFCgIy08RBKPAhZQyIzwcvPV2eh8= -k8s.io/client-go v0.0.0-20210206011112-100613764a76/go.mod h1:JP/D55gccwJmpx9Ipo+OBw26gGWX3rzwISGjNZfGViM= -k8s.io/code-generator v0.0.0-20210206010601-575533eae677/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -443,6 +439,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c= +sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=