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

Merge remote-tracking branch 'origin/master' into release-1.17 

Kubernetes-commit: 53697d28302afd7d2b1e453ad26c2593ed7de5aa
This commit is contained in:
Kubernetes Publisher 2019-11-07 08:27:16 +00:00
parent c1057700ac
commit c6cdf498d5
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Godeps/Godeps.json generated
View File

@ -192,7 +192,7 @@
}, },
{ {
"ImportPath": "github.com/gregjones/httpcache", "ImportPath": "github.com/gregjones/httpcache",
"Rev": "787624de3eb7" "Rev": "9cad4c3443a7"
}, },
{ {
"ImportPath": "github.com/hashicorp/golang-lru", "ImportPath": "github.com/hashicorp/golang-lru",
@ -320,7 +320,7 @@
}, },
{ {
"ImportPath": "github.com/spf13/pflag", "ImportPath": "github.com/spf13/pflag",
"Rev": "v1.0.3" "Rev": "v1.0.5"
}, },
{ {
"ImportPath": "github.com/stretchr/objx", "ImportPath": "github.com/stretchr/objx",
@ -336,7 +336,7 @@
}, },
{ {
"ImportPath": "golang.org/x/crypto", "ImportPath": "golang.org/x/crypto",
"Rev": "e84da0312774" "Rev": "60c769a6c586"
}, },
{ {
"ImportPath": "golang.org/x/exp", "ImportPath": "golang.org/x/exp",
@ -344,35 +344,39 @@
}, },
{ {
"ImportPath": "golang.org/x/lint", "ImportPath": "golang.org/x/lint",
"Rev": "8f45f776aaf1" "Rev": "5614ed5bae6f"
}, },
{ {
"ImportPath": "golang.org/x/net", "ImportPath": "golang.org/x/net",
"Rev": "cdfb69ac37fc" "Rev": "13f9640d40b9"
}, },
{ {
"ImportPath": "golang.org/x/oauth2", "ImportPath": "golang.org/x/oauth2",
"Rev": "9f3314589c9a" "Rev": "0f29369cfe45"
}, },
{ {
"ImportPath": "golang.org/x/sync", "ImportPath": "golang.org/x/sync",
"Rev": "42b317875d0f" "Rev": "112230192c58"
}, },
{ {
"ImportPath": "golang.org/x/sys", "ImportPath": "golang.org/x/sys",
"Rev": "3b5209105503" "Rev": "fde4db37ae7a"
}, },
{ {
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
"Rev": "e6919f6577db" "Rev": "v0.3.2"
}, },
{ {
"ImportPath": "golang.org/x/time", "ImportPath": "golang.org/x/time",
"Rev": "f51c12702a4d" "Rev": "9d24e82272b4"
}, },
{ {
"ImportPath": "golang.org/x/tools", "ImportPath": "golang.org/x/tools",
"Rev": "e65039ee4138" "Rev": "65e3620a7ae7"
},
{
"ImportPath": "golang.org/x/xerrors",
"Rev": "a985d3407aa7"
}, },
{ {
"ImportPath": "google.golang.org/api", "ImportPath": "google.golang.org/api",
@ -404,7 +408,7 @@
}, },
{ {
"ImportPath": "gopkg.in/inf.v0", "ImportPath": "gopkg.in/inf.v0",
"Rev": "v0.9.0" "Rev": "v0.9.1"
}, },
{ {
"ImportPath": "gopkg.in/tomb.v1", "ImportPath": "gopkg.in/tomb.v1",
@ -420,19 +424,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "f26842a96636" "Rev": "43b1ad33cf6f"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "8b539fc8459d" "Rev": "9c5262af35ca"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "b132d4e8c200" "Rev": "4fb1ca18cab3"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "5ba71dd09dcd" "Rev": "0c26570163f1"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.12 go 1.12
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20191107082716-9c5262af35ca
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20191107111705-0c26570163f1
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20191107110442-43b1ad33cf6f
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191107082716-9c5262af35ca
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20191107082716-4fb1ca18cab3
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20191107111705-0c26570163f1
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

4
go.sum
View File

@ -186,6 +186,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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-20191107110442-43b1ad33cf6f/go.mod h1:/24HivhMZ6CLcfc0Nk41go4k5jb5bBTAP+9UA293OCw=
k8s.io/apimachinery v0.0.0-20191107082716-9c5262af35ca/go.mod h1:DJOb3m0kw91A0YaUsaoYChi4d7xVF84HLiuRCxGsV04=
k8s.io/client-go v0.0.0-20191107082716-4fb1ca18cab3/go.mod h1:1jApd5JRwKEQy8qHEwU6UpHbokcuIPWRNm1pI2Zu6p0=
k8s.io/component-base v0.0.0-20191107111705-0c26570163f1/go.mod h1:9Xzuws0f9Yg+SxFAb9ZTGE2LE7W6v0iKCklcfNbBTQs=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=