github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-02-20 23:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86975 from dims/update-hcsshim-v0.8.7-and-containerd-v1.3.2

Browse Source 
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 7f0055f0c9
commit 041853156b
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Godeps/Godeps.json generated
View File

@ -132,7 +132,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.1"
"Rev": "v0.4.0"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -192,7 +192,7 @@
},
{
"ImportPath": "github.com/kr/pretty",
"Rev": "v0.1.0"
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/kr/pty",
@ -272,7 +272,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "13f9640d40b9"
"Rev": "16171245cfb2"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -292,7 +292,7 @@
},
{
"ImportPath": "golang.org/x/time",
"Rev": "9d24e82272b4"
"Rev": "555d28b269f0"
},
{
"ImportPath": "golang.org/x/tools",
@ -300,7 +300,7 @@
},
{
"ImportPath": "golang.org/x/xerrors",
"Rev": "a985d3407aa7"
"Rev": "9bdfabe68543"
},
{
"ImportPath": "google.golang.org/api",
@ -320,7 +320,7 @@
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "788fd7840127"
"Rev": "41f04d3bba15"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@ -344,19 +344,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/code-generator",
"Rev": "134829e366d8"
"Rev": "24eba7841593"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20200326015715-b5bd82427fa8
k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6
k8s.io/code-generator v0.0.0-20200326014500-24eba7841593
k8s.io/klog v1.0.0
)
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/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
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/code-generator => k8s.io/code-generator v0.0.0-20200326014500-24eba7841593
)

4
go.sum
View File

@ -205,6 +205,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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/code-generator v0.0.0-20200326014500-24eba7841593/go.mod h1:1lyWWdDpcrAfLSqwJSCf20KSqoobp5XhTfsWZa7mJBM=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=