kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 7e7e12fdd1
commit 9eb1679911
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -312,7 +312,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.5.4"
"Rev": "v0.5.2"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -816,7 +816,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "d19ff857e887"
"Rev": "a50acf3fe073"
},
{
"ImportPath": "golang.org/x/term",
@ -920,19 +920,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "8d7383bd2490"
"Rev": "bb4775a810cf"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "e1b4d3faae10"
"Rev": "2540c63454fb"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "da281643cfad"
"Rev": "03f765c56af0"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "b5a495af30a7"
"Rev": "84c0c6f957d1"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -38,10 +38,10 @@ require (
google.golang.org/grpc v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base 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/component-base v0.0.0-20210518193623-84c0c6f957d1
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
@ -51,9 +51,8 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
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/component-base => k8s.io/component-base v0.0.0-20210518193623-84c0c6f957d1
)

8
go.sum
View File

@ -674,6 +674,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
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/component-base v0.0.0-20210518193623-84c0c6f957d1 h1:rIn8PLxPta2EAayuy5h182M0QETUgiWqxbGuaSCKHOM=
k8s.io/component-base v0.0.0-20210518193623-84c0c6f957d1/go.mod h1:vXiQMyfLEb37Cizy+vvcbtcMFzK1N9BOMBMHiyfOvIM=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=