From 4b8a73bfbaf4a8338ed6241557b61fa8150bc7bd Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 29 Jun 2021 18:58:34 -0700 Subject: [PATCH] Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: e4783dfff48785b7eaddfe4b11236396b41e337f --- go.mod | 13 +++++++------ go.sum | 10 ++-------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index c18cd82..c4add56 100644 --- a/go.mod +++ b/go.mod @@ -5,13 +5,14 @@ module k8s.io/kube-controller-manager go 1.15 require ( - k8s.io/apimachinery v0.0.0-20210329192041-0c7db653e2b6 - k8s.io/component-base v0.0.0-20210329195226-dc8214616049 + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210329192645-60680b5087d3 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329192041-0c7db653e2b6 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210329193902-8b9f5901612d - k8s.io/component-base => k8s.io/component-base v0.0.0-20210329195226-dc8214616049 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/go.sum b/go.sum index da83204..0e2973a 100644 --- a/go.sum +++ b/go.sum @@ -362,12 +362,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= -k8s.io/api v0.0.0-20210329192645-60680b5087d3/go.mod h1:caTs/4rCE73izFZceHw5Pv4eK7+8BmGwNb20G7qIqAY= -k8s.io/apimachinery v0.0.0-20210329192041-0c7db653e2b6 h1:posgALa4ApFtf1aSzAqPVMIgrADxXTMCHuf/PolVMpo= -k8s.io/apimachinery v0.0.0-20210329192041-0c7db653e2b6/go.mod h1:9eb44nUQSsz9QZiilFRuMj3ZbTmoWolU8S2gnXoRMjo= -k8s.io/client-go v0.0.0-20210329193902-8b9f5901612d/go.mod h1:SyQ/3qvcTfPs2n6ER4D8yndVgiridrMbKkDXBbo6w1U= -k8s.io/component-base v0.0.0-20210329195226-dc8214616049 h1:6v59udwWj2W2wskeDjwoi6iU9i5WDT3Tmly5E2BJ8fg= -k8s.io/component-base v0.0.0-20210329195226-dc8214616049/go.mod h1:FRcXnK03T4l+HVRlDEsJFBMCmMFQzigv0l3HEtfhLkk= 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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= @@ -377,8 +371,8 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/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/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= 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=