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
This commit is contained in:
Kubernetes Publisher 2021-05-21 12:58:11 -07:00
parent f463884a27
commit 260828e7ce
3 changed files with 22 additions and 15 deletions

12
Godeps/Godeps.json generated
View File

@ -196,7 +196,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.5.2"
"Rev": "v0.5.4"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -400,7 +400,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "a50acf3fe073"
"Rev": "d19ff857e887"
},
{
"ImportPath": "golang.org/x/term",
@ -476,19 +476,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "51a1c5553d68"
"Rev": "b96220531b73"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "e337f44144a6"
"Rev": "1a7b32ce3b15"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "6be0785e0e32"
"Rev": "ffd8cfc5638d"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "cb1b268548af"
"Rev": "e3528c8bc482"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20210521231242-b96220531b73
k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d
k8s.io/code-generator v0.0.0-20210521230601-e3528c8bc482
k8s.io/klog/v2 v2.8.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
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
)

8
go.sum
View File

@ -435,6 +435,14 @@ 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/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 h1:Mj9PNpBtYD6ofx+UQDKqIIDG2nmWCi636PnXpOBciT8=
k8s.io/code-generator v0.0.0-20210521230601-e3528c8bc482/go.mod h1:8mXJDCB7HcRo1xiEQstcguZkbxZaqeUOrO9SsicWs3U=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=