Merge pull request #102147 from kolyshkin/update-runc-rc94-take-II

vendor: bump runc to rc95

Kubernetes-commit: 5de1a754c8f875cacfa49b9c5ed63c6c35b7e9e5
This commit is contained in:
Kubernetes Publisher 2021-05-20 17:16:56 -07:00
parent 833f4d6bb8
commit 55b9f760f5
3 changed files with 40 additions and 26 deletions

20
Godeps/Godeps.json generated
View File

@ -388,7 +388,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.5.2"
"Rev": "v0.5.4"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -952,7 +952,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "a50acf3fe073"
"Rev": "d19ff857e887"
},
{
"ImportPath": "golang.org/x/term",
@ -1044,31 +1044,31 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "d5fda5562a2e"
"Rev": "191e7be037d4"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "c7322e849168"
"Rev": "adc48d2d7eb5"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "742f66824d8e"
"Rev": "cab8b2c14709"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b0c8a7cef141"
"Rev": "d1fa200aef5b"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "deed3360ef40"
"Rev": "0213807b44bf"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "8b08f85f6db5"
"Rev": "2a2fe9bbf92f"
},
{
"ImportPath": "k8s.io/component-helpers",
"Rev": "41eea304b4c6"
"Rev": "5ed6d3a5a2d5"
},
{
"ImportPath": "k8s.io/gengo",
@ -1084,7 +1084,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "d4f6f0e322cf"
"Rev": "ec63c1eec669"
},
{
"ImportPath": "k8s.io/utils",

31
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0
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-20210521070909-191e7be037d4
k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5
k8s.io/cli-runtime v0.0.0-20210521073539-cab8b2c14709
k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b
k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f
k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669
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
@ -47,13 +47,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-20210521070909-191e7be037d4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210521073539-cab8b2c14709
k8s.io/client-go => k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210521070450-0213807b44bf
k8s.io/component-base => k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5
k8s.io/metrics => k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669
)

15
go.sum
View File

@ -740,6 +740,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-20210521070909-191e7be037d4 h1:qgCkzN01a1u8h5bYNgyqdKqGL+K19wvkp1JLOv3Oj2E=
k8s.io/api v0.0.0-20210521070909-191e7be037d4/go.mod h1:GfPTpPBzvUagWJY1n2kt8oncShcczHwc4trHJ+04pNE=
k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5 h1:h4JFYCyQWf4U+jFWHXMZYkL9Drx9hLiBQbftQBMAfwU=
k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5/go.mod h1:8Ay3sPKuJtD/dIjPSlQVgJeuW/8JmLTCqDeAv6NSCxU=
k8s.io/cli-runtime v0.0.0-20210521073539-cab8b2c14709 h1:rVNPYMlI5mb0/AaGd/Gr5oZ6bp7bnWOjTKJ2mi7ve24=
k8s.io/cli-runtime v0.0.0-20210521073539-cab8b2c14709/go.mod h1:GaESJjZtXWLut5xjYO6A+JmrUHyTBvHFO2vjkQ5Ggo4=
k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b h1:mcl3yABrLVtYYWiFDkScO9n8op2wxzwEzReyjO4WEPY=
k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b/go.mod h1:fSZsfZrJMyBRs3783ddvdNtsZlZbJDL4O3F1ROhjdIY=
k8s.io/code-generator v0.0.0-20210521070450-0213807b44bf/go.mod h1:+I0Y7dLDIEgEJ8mo7J7cv/qF+opHxLfD1Ey7zbDmTIA=
k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f h1:5WGHsufGjyHFfwMXj0R/nilyN7HzOrb1XqGO6NErjDY=
k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f/go.mod h1:PLrHIJKBKJZB+zZsUAAQNbGrps/afIih9Oj/oqdQtsc=
k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5 h1:LyASbOBRe6hZyOz0iUqy3vN2NAhoXGdyS3Sx0ceY0yk=
k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5/go.mod h1:VtHw8VdyD4tglf1kptO/xCLXjw0LSJfvEg8cxVdpiKA=
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=
@ -748,6 +761,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-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669 h1:loDZnEiDKgNUSLRKvGEZAEtww0ZFPcGRLGikZH4aGzc=
k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669/go.mod h1:SL7pVk0pMYgpH34rTPr7FobH0lYUahopvm3Hm4Ah1eM=
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=