Merge pull request #102094 from liggitt/revert-runc

Revert "Merge pull request #101888 from kolyshkin/update-runc-rc94"

Kubernetes-commit: 1295b2c4b59b8bba58186294eb2d76a7ecb4987e
This commit is contained in:
Kubernetes Publisher 2021-05-18 08:35:32 -07:00
parent 072b9c7723
commit 390736d374
3 changed files with 22 additions and 15 deletions

12
Godeps/Godeps.json generated
View File

@ -192,7 +192,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.5.4"
"Rev": "v0.5.2"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -400,7 +400,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "d19ff857e887"
"Rev": "a50acf3fe073"
},
{
"ImportPath": "golang.org/x/term",
@ -476,19 +476,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "c10867da44cc"
"Rev": "bb4775a810cf"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "e1b4d3faae10"
"Rev": "2540c63454fb"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "da281643cfad"
"Rev": "03f765c56af0"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "66f43cf5fe58"
"Rev": "994995d2440d"
},
{
"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-20210518191546-bb4775a810cf
k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb
k8s.io/client-go v0.0.0-20210518192254-03f765c56af0
k8s.io/code-generator v0.0.0-20210518190444-994995d2440d
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-20210518191546-bb4775a810cf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518192254-03f765c56af0
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210518190444-994995d2440d
)

8
go.sum
View File

@ -427,6 +427,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-20210518191546-bb4775a810cf h1://fF+z+xmCAC5mLdeZZM/5nv5dfffNEvQmx3e725bqY=
k8s.io/api v0.0.0-20210518191546-bb4775a810cf/go.mod h1:yBHRhVZ8UyTD3ouMqKUsGMI0W+g6+mDd6L2SrxTF8lQ=
k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb h1:EZCUeWm5oj7bRkpo95xXigoMzDH8VfDi8tq7NN98Ozc=
k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
k8s.io/client-go v0.0.0-20210518192254-03f765c56af0 h1:5M94pfh3VbCSWTG0yk4vYX5HRmT2ZIs9dz1qnMfkBso=
k8s.io/client-go v0.0.0-20210518192254-03f765c56af0/go.mod h1:Ne57hQrsEvmL96pF++09MGljFqjpKmUCX4NdoWR8eoo=
k8s.io/code-generator v0.0.0-20210518190444-994995d2440d h1:vtn+dQ8F0NrKhJhT8eBHzF3H6BMHYw27QGwJ8Sd8AAM=
k8s.io/code-generator v0.0.0-20210518190444-994995d2440d/go.mod h1:tHNeGA58jE3nJvZLDN0c/5k7P3NlYdjbWuJYK9QiU3s=
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=