Merge pull request #86975 from dims/update-hcsshim-v0.8.7-and-containerd-v1.3.2
Update to latest cadvisor and containerd (v1.3.3) Kubernetes-commit: 4ad32682f3605f8eb0c152e3139a42d756106831
This commit is contained in:
Kubernetes Publisher
parent
c596b3f418
commit
37b1f0148f
|
|
@ -164,7 +164,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/go-cmp",
|
||||
"Rev": "v0.3.1"
|
||||
"Rev": "v0.4.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/gofuzz",
|
||||
|
|
@ -228,7 +228,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/konsorten/go-windows-terminal-sequences",
|
||||
"Rev": "v1.0.1"
|
||||
"Rev": "v1.0.2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/kr/logfmt",
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/kr/pretty",
|
||||
"Rev": "v0.1.0"
|
||||
"Rev": "v0.2.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/kr/pty",
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
|
||||
"Rev": "v1.0.1"
|
||||
"Rev": "c182affec369"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/moby/term",
|
||||
|
|
@ -312,7 +312,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/prometheus/procfs",
|
||||
"Rev": "v0.0.2"
|
||||
"Rev": "v0.0.5"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/sirupsen/logrus",
|
||||
|
|
@ -352,7 +352,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net",
|
||||
"Rev": "13f9640d40b9"
|
||||
"Rev": "16171245cfb2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/oauth2",
|
||||
|
|
@ -372,7 +372,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/time",
|
||||
"Rev": "9d24e82272b4"
|
||||
"Rev": "555d28b269f0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/tools",
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/xerrors",
|
||||
"Rev": "a985d3407aa7"
|
||||
"Rev": "9bdfabe68543"
|
||||
},
|
||||
{
|
||||
"ImportPath": "google.golang.org/api",
|
||||
|
|
@ -404,7 +404,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "gopkg.in/check.v1",
|
||||
"Rev": "788fd7840127"
|
||||
"Rev": "41f04d3bba15"
|
||||
},
|
||||
{
|
||||
"ImportPath": "gopkg.in/fsnotify.v1",
|
||||
|
|
@ -436,19 +436,19 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "1fc28ea2498c"
|
||||
"Rev": "b5bd82427fa8"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "1aec6bc431a9"
|
||||
"Rev": "e92250ad09d8"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "c20e80a28e46"
|
||||
"Rev": "6240434e1ad6"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/component-base",
|
||||
"Rev": "96026f7a5f3b"
|
||||
"Rev": "e497f1de9ccf"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
|
|
|
|||
13
go.mod
13
go.mod
|
|
@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
|
|||
go 1.13
|
||||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0
|
||||
k8s.io/component-base v0.0.0
|
||||
k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
|
||||
k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf
|
||||
)
|
||||
|
||||
replace (
|
||||
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
|
||||
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
|
||||
k8s.io/api => ../api
|
||||
k8s.io/apimachinery => ../apimachinery
|
||||
k8s.io/client-go => ../client-go
|
||||
k8s.io/component-base => ../component-base
|
||||
k8s.io/kube-controller-manager => ../kube-controller-manager
|
||||
k8s.io/api => k8s.io/api v0.0.0-20200326015715-b5bd82427fa8
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf
|
||||
)
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -201,6 +201,10 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
|
|||
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
k8s.io/api v0.0.0-20200326015715-b5bd82427fa8/go.mod h1:ccyYpAL1p/8sTW0H16JKHFFZ+99445VJK+SEiiyYEcg=
|
||||
k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8/go.mod h1:MwmRUlFgPZZjQ9mmX205Ve0gth+HzXB7tiAFmJilVME=
|
||||
k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6/go.mod h1:qcKFlt/v+9msJK8wX7HIxQfbxR7Avq+hAcomDVcfhUI=
|
||||
k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf/go.mod h1:CrYC6PfucljQ1Zt/e5g/ZiqbolCUEjVEkL9xfxSFWk0=
|
||||
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
|
||||
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
|
||||
|
|
|
|||
Loading…
Reference in New Issue