Merge pull request #91366 from giuseppe/cgroupfs-cgroupv2

vendor: update google/cadvisor and opencontainers/runc

Kubernetes-commit: a03db636daef0417218ef8c108c0a6530d2ef368
This commit is contained in:
Kubernetes Publisher 2020-06-26 04:17:31 -07:00
parent 7e848aeed2
commit db5293afc7
3 changed files with 12 additions and 11 deletions

12
Godeps/Godeps.json generated
View File

@ -372,7 +372,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "915c9c3d4ccf"
"Rev": "ed371f2e16b4"
},
{
"ImportPath": "golang.org/x/text",
@ -400,15 +400,15 @@
},
{
"ImportPath": "google.golang.org/genproto",
"Rev": "f3c370f40bfb"
"Rev": "cb27e3aa2013"
},
{
"ImportPath": "google.golang.org/grpc",
"Rev": "v1.26.0"
"Rev": "v1.27.0"
},
{
"ImportPath": "google.golang.org/protobuf",
"Rev": "v1.23.0"
"Rev": "v1.24.0"
},
{
"ImportPath": "gopkg.in/check.v1",
@ -440,11 +440,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "6f8e0fa87f2f"
"Rev": "f849118f70f6"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "eed6a5257d68"
"Rev": "3b98a76529ae"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -26,15 +26,14 @@ require (
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20200626130448-f849118f70f6
k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae
k8s.io/klog/v2 v2.1.0
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20200626130448-f849118f70f6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae
)

2
go.sum
View File

@ -330,6 +330,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.0.0-20200626130448-f849118f70f6/go.mod h1:NKnRcQSY4TIqMb0OI3a9oDdDJflkQO6p9sY6iKIpvco=
k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae/go.mod h1:m5QoVMHU94aieNFPfLqf7WmU8HLVLm3JasG64COkSXQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=