Skip to content

Commit 9b11117

Browse files
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
1 parent e36a7f9 commit 9b11117

File tree

3 files changed

+40
-26
lines changed

3 files changed

+40
-26
lines changed

Godeps/Godeps.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,28 @@ require (
3333
github.com/stretchr/testify v1.6.1
3434
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
3535
gopkg.in/yaml.v2 v2.4.0
36-
k8s.io/api v0.0.0
37-
k8s.io/apimachinery v0.0.0
38-
k8s.io/cli-runtime v0.0.0
39-
k8s.io/client-go v0.0.0
40-
k8s.io/component-base v0.0.0
41-
k8s.io/component-helpers v0.0.0
36+
k8s.io/api v0.0.0-20210521231242-b96220531b73
37+
k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
38+
k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248
39+
k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d
40+
k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b
41+
k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2
4242
k8s.io/klog/v2 v2.8.0
4343
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
44-
k8s.io/metrics v0.0.0
44+
k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79
4545
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
4646
sigs.k8s.io/kustomize/api v0.8.8
4747
sigs.k8s.io/kustomize/kustomize/v4 v4.1.2
4848
sigs.k8s.io/yaml v1.2.0
4949
)
5050

5151
replace (
52-
k8s.io/api => ../api
53-
k8s.io/apimachinery => ../apimachinery
54-
k8s.io/cli-runtime => ../cli-runtime
55-
k8s.io/client-go => ../client-go
56-
k8s.io/code-generator => ../code-generator
57-
k8s.io/component-base => ../component-base
58-
k8s.io/component-helpers => ../component-helpers
59-
k8s.io/kubectl => ../kubectl
60-
k8s.io/metrics => ../metrics
52+
k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73
53+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
54+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248
55+
k8s.io/client-go => k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d
56+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210521230601-e3528c8bc482
57+
k8s.io/component-base => k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b
58+
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2
59+
k8s.io/metrics => k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79
6160
)

go.sum

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,19 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
722722
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
723723
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
724724
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
725+
k8s.io/api v0.0.0-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no=
726+
k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM=
727+
k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4=
728+
k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
729+
k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248 h1:urtyaS0Z2ukwDXw8WEOBzcQZAeslPaw2MhV22dG3ajc=
730+
k8s.io/cli-runtime v0.0.0-20210521234858-26ed6aba0248/go.mod h1:CmBmKZ1GdkUkINtQ3ypqUMgXL3vhmAWDvO4uhQgMXiA=
731+
k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d h1:gaKyrpKn1YJ05unGkg2Dlbs9PE4yiBm6QeY4h1mJ5nc=
732+
k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d/go.mod h1:5CwzOhEL+/47w5srOLQwDN6ILFRpFF/4htuyNWtSMcw=
733+
k8s.io/code-generator v0.0.0-20210521230601-e3528c8bc482/go.mod h1:8mXJDCB7HcRo1xiEQstcguZkbxZaqeUOrO9SsicWs3U=
734+
k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b h1:yRafkncohj21ItWfMMLKX3YIrLxrSZaFgUhSi9eBPm0=
735+
k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b/go.mod h1:tWPM5VVcHmAtb1itx5cU8GYYdfrEgEW4CTP2uYY1xhM=
736+
k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2 h1:RT5rH/oYirewwAtpk1bHb5tqUXvFhmfad+TYsKYKBUo=
737+
k8s.io/component-helpers v0.0.0-20210521232609-ba672f7724f2/go.mod h1:eB5JU30Xy4PszPC+8NI+4BvMABu3Aa12hrg/7ScAh4A=
725738
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
726739
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
727740
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=
730743
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
731744
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
732745
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
746+
k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79 h1:VIBuhYFMiMyQvzmb9+5nz14CN7c73a+FLUr9EPxIFEc=
747+
k8s.io/metrics v0.0.0-20210521234700-a8df22cfce79/go.mod h1:IlsGyiT93+sgqtfL96rPFCJV8ra5EoBqyVN/CcPMWzM=
733748
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
734749
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
735750
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

0 commit comments

Comments
 (0)