From 8d9665fcc61cf755380e11fa4c76f35d56f9b661 Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 29 Jun 2021 18:52:42 -0700 Subject: [PATCH] Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: a67405b94349d5620384671cda5d380ad03ce0ed --- go.mod | 21 +++++++++++---------- go.sum | 16 ++-------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 2538065..307aeea 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,18 @@ module k8s.io/kube-controller-manager go 1.15 require ( - k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1 - k8s.io/cloud-provider v0.0.0-20210602124109-dd80f4e34ae2 - k8s.io/controller-manager v0.0.0-20210602123859-e6eb64a73d7a + k8s.io/apimachinery v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/controller-manager v0.0.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210408104456-f223af846001 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210602120759-a2da199c9e35 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210518105731-357b3cd7a205 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210602124109-dd80f4e34ae2 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111616-6a77b1e67dff - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210602123859-e6eb64a73d7a + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/cloud-provider => ../cloud-provider + k8s.io/component-base => ../component-base + k8s.io/controller-manager => ../controller-manager + k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/go.sum b/go.sum index 50bdc75..5761a7b 100644 --- a/go.sum +++ b/go.sum @@ -586,18 +586,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-20210408104456-f223af846001 h1:z7zzwcnLO3xF6MWfhWuy9fiLC3E8quPHy5GGkNive6o= -k8s.io/api v0.0.0-20210408104456-f223af846001/go.mod h1:cgILOv2D1tPmboo8I/DGUMNkV0C3JtN5aAEYvcTyKQc= -k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1 h1:VxG2x5Wzg4GT/ghqOscTlJx6CFBMNHR7bC6/IaFiZB4= -k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= -k8s.io/apiserver v0.0.0-20210602120759-a2da199c9e35/go.mod h1:KyWzPQ8+u6zxUIBWr/uwfv45KW4lkrVs3AolanIOJjQ= -k8s.io/client-go v0.0.0-20210518105731-357b3cd7a205/go.mod h1:mSmAJ79BSUh0CSAcpIL9rcjU+X5/M1ab9qG+fs5LOFU= -k8s.io/cloud-provider v0.0.0-20210602124109-dd80f4e34ae2 h1:PMkwa+56zt8ZRb5EzSMbJCe1942RB8xvYjjo5YF3GFw= -k8s.io/cloud-provider v0.0.0-20210602124109-dd80f4e34ae2/go.mod h1:P1rzLgNOK5uWq/JEDChCgWMpUod42p67+5pFSyM5er4= -k8s.io/component-base v0.0.0-20210518111616-6a77b1e67dff h1:b8URpRCEA//QnWRLvahMuc1JmFgoYQ3IBj4fsPs1f9k= -k8s.io/component-base v0.0.0-20210518111616-6a77b1e67dff/go.mod h1:RynlTb2pw5JlB9Zl3TgMlOkfOz5XON3G8ffU61vncJ4= -k8s.io/controller-manager v0.0.0-20210602123859-e6eb64a73d7a h1:Osspjvm41GLpeRD7nAZ95xuxVqoiffAo4gx8A73y284= -k8s.io/controller-manager v0.0.0-20210602123859-e6eb64a73d7a/go.mod h1:d59uetsetE+vqb2VgEBOsqpvw5b3vf4M9yYKEpzkoSE= 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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= @@ -610,8 +598,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/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= 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/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=