From 1b769467977b0c012402006394ecbb18b15c48fb Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 26 Jul 2021 10:26:34 -0700 Subject: [PATCH] Merge pull request #103882 from rphillips/automated-cherry-pick-of-#103743-upstream-release-1.22 Automated cherry pick of #103743: vendor: bump runc to 1.0.1 Kubernetes-commit: f9ff52553fd60bd63bd95a522fb12fa1b900d0a9 --- go.mod | 21 ++++++++++----------- go.sum | 12 ++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 2405d3d..38454bb 100644 --- a/go.mod +++ b/go.mod @@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager go 1.16 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/controller-manager v0.0.0 + k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13 + k8s.io/cloud-provider v0.0.0-20210727112026-b230016e5fa3 + k8s.io/controller-manager v0.0.0-20210727111804-c1e6583d45af ) replace ( - 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 + k8s.io/api => k8s.io/api v0.0.0-20210716001550-68328c152cca + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210727104920-17301e1915b6 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210722183257-1e037e8d981a + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210727112026-b230016e5fa3 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210722183836-c8cabcb7d39d + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210727111804-c1e6583d45af ) diff --git a/go.sum b/go.sum index d308f64..409f0e3 100644 --- a/go.sum +++ b/go.sum @@ -681,6 +681,18 @@ 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-20210716001550-68328c152cca h1:6AoteD5dwjeRYfsAH5Z8s52Xp2trgpH98OS7KwLRvBc= +k8s.io/api v0.0.0-20210716001550-68328c152cca/go.mod h1:FtqZiusVhnyM5jUPPFkDCU91OKo0sOpX9b9hotVGbIk= +k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13 h1:Y40e5ho6n8KOvBCqdz/jm7ssKQyQLQdbZbC3lR9TaCU= +k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= +k8s.io/apiserver v0.0.0-20210727104920-17301e1915b6/go.mod h1:bQNKq8+RYUrK0mKseWoBxzWHJHLeoGYMr9szdWcu03s= +k8s.io/client-go v0.0.0-20210722183257-1e037e8d981a/go.mod h1:J0QracdtAUnDf3NWbMdpCV5lAt8WuAZFqSTcCiUeMsY= +k8s.io/cloud-provider v0.0.0-20210727112026-b230016e5fa3 h1:7KlS8/Sk/FTLZNL+UUQijdVhA4Ka/roQUtcy5yJ6q9w= +k8s.io/cloud-provider v0.0.0-20210727112026-b230016e5fa3/go.mod h1:ZMIP106+S4HPziCRy0WwAb0Fo83xGRARDdMb0EoA+bg= +k8s.io/component-base v0.0.0-20210722183836-c8cabcb7d39d h1:/mcNtizH/7LVNF658fJWKe6AJjl2EnTLLoJnzk9BCWQ= +k8s.io/component-base v0.0.0-20210722183836-c8cabcb7d39d/go.mod h1:LBVnEifw+SvQx2si1RCpd0WVE198EULnwqnMg0QBBQQ= +k8s.io/controller-manager v0.0.0-20210727111804-c1e6583d45af h1:8b1DSFfLhpTl8PPb2lIbToo2QfTxIsrl6Nyvw4IgiJg= +k8s.io/controller-manager v0.0.0-20210727111804-c1e6583d45af/go.mod h1:+9BVkMUiMcrFQ+Lp/lCEhwAUKWuN5QdAMs3CNOAJkBM= 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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=