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

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 2020-03-25 14:02:25 -07:00
parent 2a02ee270b
commit 6b2a72dcaa
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Godeps/Godeps.json generated
View File

@ -220,7 +220,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.1"
"Rev": "v0.4.0"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -296,7 +296,7 @@
},
{
"ImportPath": "github.com/konsorten/go-windows-terminal-sequences",
"Rev": "v1.0.1"
"Rev": "v1.0.2"
},
{
"ImportPath": "github.com/kr/logfmt",
@ -304,7 +304,7 @@
},
{
"ImportPath": "github.com/kr/pretty",
"Rev": "v0.1.0"
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/kr/pty",
@ -332,7 +332,7 @@
},
{
"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
"Rev": "v1.0.1"
"Rev": "c182affec369"
},
{
"ImportPath": "github.com/mitchellh/go-homedir",
@ -412,7 +412,7 @@
},
{
"ImportPath": "github.com/prometheus/procfs",
"Rev": "v0.0.2"
"Rev": "v0.0.5"
},
{
"ImportPath": "github.com/russross/blackfriday",
@ -484,7 +484,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "13f9640d40b9"
"Rev": "16171245cfb2"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -504,7 +504,7 @@
},
{
"ImportPath": "golang.org/x/time",
"Rev": "9d24e82272b4"
"Rev": "555d28b269f0"
},
{
"ImportPath": "golang.org/x/tools",
@ -512,7 +512,7 @@
},
{
"ImportPath": "golang.org/x/xerrors",
"Rev": "a985d3407aa7"
"Rev": "9bdfabe68543"
},
{
"ImportPath": "google.golang.org/api",
@ -536,7 +536,7 @@
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "788fd7840127"
"Rev": "41f04d3bba15"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@ -568,27 +568,27 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "1fc28ea2498c"
"Rev": "b5bd82427fa8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1aec6bc431a9"
"Rev": "e92250ad09d8"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "e1e770ed862c"
"Rev": "77d7d76edfc9"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "c20e80a28e46"
"Rev": "6240434e1ad6"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "134829e366d8"
"Rev": "24eba7841593"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "96026f7a5f3b"
"Rev": "e497f1de9ccf"
},
{
"ImportPath": "k8s.io/gengo",
@ -604,7 +604,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "34bf131139aa"
"Rev": "feda5dbe8e43"
},
{
"ImportPath": "k8s.io/utils",

27
go.mod
View File

@ -34,14 +34,14 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20200326015715-b5bd82427fa8
k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
k8s.io/cli-runtime v0.0.0-20200326030619-77d7d76edfc9
k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6
k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20200326030134-feda5dbe8e43
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -51,12 +51,11 @@ require (
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/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20200326015715-b5bd82427fa8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200326030619-77d7d76edfc9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200326014500-24eba7841593
k8s.io/component-base => k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf
k8s.io/metrics => k8s.io/metrics v0.0.0-20200326030134-feda5dbe8e43
)

7
go.sum
View File

@ -326,6 +326,12 @@ 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/cli-runtime v0.0.0-20200326030619-77d7d76edfc9/go.mod h1:u7BuFKwcVhFiX7IlG/vKVc6ekMNFtvnE3UpIRln3+jQ=
k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6/go.mod h1:qcKFlt/v+9msJK8wX7HIxQfbxR7Avq+hAcomDVcfhUI=
k8s.io/code-generator v0.0.0-20200326014500-24eba7841593/go.mod h1:1lyWWdDpcrAfLSqwJSCf20KSqoobp5XhTfsWZa7mJBM=
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/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@ -334,6 +340,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
k8s.io/metrics v0.0.0-20200326030134-feda5dbe8e43/go.mod h1:BMXWjrF5ByebBpCu6lVNjO7y1/17oL7dQVt81Tkcyqc=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=