Merge pull request #91366 from giuseppe/cgroupfs-cgroupv2
vendor: update google/cadvisor and opencontainers/runc Kubernetes-commit: a03db636daef0417218ef8c108c0a6530d2ef368
This commit is contained in:
parent
664f72ff1d
commit
278c7b1c77
|
@ -296,7 +296,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/konsorten/go-windows-terminal-sequences",
|
||||
"Rev": "v1.0.2"
|
||||
"Rev": "v1.0.3"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/kr/logfmt",
|
||||
|
@ -388,7 +388,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/sirupsen/logrus",
|
||||
"Rev": "v1.4.2"
|
||||
"Rev": "v1.6.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/afero",
|
||||
|
@ -460,7 +460,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/sys",
|
||||
"Rev": "915c9c3d4ccf"
|
||||
"Rev": "ed371f2e16b4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/text",
|
||||
|
@ -488,15 +488,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/alecthomas/kingpin.v2",
|
||||
|
@ -540,19 +540,19 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "6f8e0fa87f2f"
|
||||
"Rev": "f849118f70f6"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "eed6a5257d68"
|
||||
"Rev": "3b98a76529ae"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "5fade4ec57c6"
|
||||
"Rev": "db5293afc7bf"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/component-base",
|
||||
"Rev": "9e66bcb5dd0c"
|
||||
"Rev": "f52a9b7250e8"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
|
|
13
go.mod
13
go.mod
|
@ -5,14 +5,13 @@ module k8s.io/kube-proxy
|
|||
go 1.14
|
||||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0
|
||||
k8s.io/component-base v0.0.0
|
||||
k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae
|
||||
k8s.io/component-base v0.0.0-20200626131333-f52a9b7250e8
|
||||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => ../api
|
||||
k8s.io/apimachinery => ../apimachinery
|
||||
k8s.io/client-go => ../client-go
|
||||
k8s.io/component-base => ../component-base
|
||||
k8s.io/kube-proxy => ../kube-proxy
|
||||
k8s.io/api => k8s.io/api v0.0.0-20200626130448-f849118f70f6
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20200626131333-f52a9b7250e8
|
||||
)
|
||||
|
|
4
go.sum
4
go.sum
|
@ -350,6 +350,10 @@ 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/client-go v0.0.0-20200626130735-db5293afc7bf/go.mod h1:xWyNNU1CYxp5Qle29OSU49QrlzME3jkGOpv9FsbIFr4=
|
||||
k8s.io/component-base v0.0.0-20200626131333-f52a9b7250e8/go.mod h1:c8B2Gs7ipNKY0Hn4SBgCBsMo38vovG9B2E90kf+Fg1E=
|
||||
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=
|
||||
|
|
Loading…
Reference in New Issue