From 9b11117f7bc715870c5359e5f039429e951ad6f0 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 21 May 2021 12:58:11 -0700 Subject: [PATCH] Merge pull request #102196 from kolyshkin/automated-cherry-pick-of-#102147-upstream-release-1.21 Automated cherry pick of #102147: vendor: bump runc to rc95 Kubernetes-commit: 133f66aa603c4624ff3544f26f54a153a54c6f94 --- Godeps/Godeps.json | 20 ++++++++++---------- go.mod | 31 +++++++++++++++---------------- go.sum | 15 +++++++++++++++ 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 1c75af6bc..f7cab0caf 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -388,7 +388,7 @@ }, { "ImportPath": "github.com/google/go-cmp", - "Rev": "v0.5.2" + "Rev": "v0.5.4" }, { "ImportPath": "github.com/google/gofuzz", @@ -940,7 +940,7 @@ }, { "ImportPath": "golang.org/x/sys", - "Rev": "a50acf3fe073" + "Rev": "d19ff857e887" }, { "ImportPath": "golang.org/x/term", @@ -1032,31 +1032,31 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "e379db4b881d" + "Rev": "b96220531b73" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "be0c81341c37" + "Rev": "1a7b32ce3b15" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "10ad15c2ef66" + "Rev": "26ed6aba0248" }, { "ImportPath": "k8s.io/client-go", - "Rev": "307e3a38a167" + "Rev": "ffd8cfc5638d" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "cb1b268548af" + "Rev": "e3528c8bc482" }, { "ImportPath": "k8s.io/component-base", - "Rev": "5feaa80744bd" + "Rev": "2aef4dc4494b" }, { "ImportPath": "k8s.io/component-helpers", - "Rev": "9d0176ad0d22" + "Rev": "ba672f7724f2" }, { "ImportPath": "k8s.io/gengo", @@ -1072,7 +1072,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "064a2af7ea58" + "Rev": "a8df22cfce79" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index 71830b89a..1c43c61e9 100644 --- a/go.mod +++ b/go.mod @@ -33,15 +33,15 @@ require ( github.com/stretchr/testify v1.6.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 - k8s.io/component-helpers v0.0.0 + k8s.io/api v0.0.0-20210521231242-b96220531b73 + k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 + k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248 + k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d + k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b + k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2 k8s.io/klog/v2 v2.8.0 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/kustomize/api v0.8.8 sigs.k8s.io/kustomize/kustomize/v4 v4.1.2 @@ -49,13 +49,12 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210521230601-e3528c8bc482 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2 + k8s.io/metrics => k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79 ) diff --git a/go.sum b/go.sum index 741b4a9e0..df0d1d443 100644 --- a/go.sum +++ b/go.sum @@ -722,6 +722,19 @@ 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-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no= +k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM= +k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4= +k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= +k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248 h1:urtyaS0Z2ukwDXw8WEOBzcQZAeslPaw2MhV22dG3ajc= +k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248/go.mod h1:CmBmKZ1GdkUkINtQ3ypqUMgXL3vhmAWDvO4uhQgMXiA= +k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d h1:gaKyrpKn1YJ05unGkg2Dlbs9PE4yiBm6QeY4h1mJ5nc= +k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d/go.mod h1:5CwzOhEL+/47w5srOLQwDN6ILFRpFF/4htuyNWtSMcw= +k8s.io/code-generator v0.0.0-20210521230601-e3528c8bc482/go.mod h1:8mXJDCB7HcRo1xiEQstcguZkbxZaqeUOrO9SsicWs3U= +k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b h1:yRafkncohj21ItWfMMLKX3YIrLxrSZaFgUhSi9eBPm0= +k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b/go.mod h1:tWPM5VVcHmAtb1itx5cU8GYYdfrEgEW4CTP2uYY1xhM= +k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2 h1:RT5rH/oYirewwAtpk1bHb5tqUXvFhmfad+TYsKYKBUo= +k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2/go.mod h1:eB5JU30Xy4PszPC+8NI+4BvMABu3Aa12hrg/7ScAh4A= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -730,6 +743,8 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= +k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79 h1:VIBuhYFMiMyQvzmb9+5nz14CN7c73a+FLUr9EPxIFEc= +k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79/go.mod h1:IlsGyiT93+sgqtfL96rPFCJV8ra5EoBqyVN/CcPMWzM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=