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

Kubernetes-commit: 1aea0dd9383a2f7ac9f7e055ff10a08ea241db51

Godeps/Godeps.json

@@ -8,7 +8,7 @@
 	"Deps": [
 		{
 			"ImportPath": "cloud.google.com/go",
-			"Rev": "v0.34.0"
+			"Rev": "v0.38.0"
 		},
 		{
 			"ImportPath": "github.com/Azure/go-autorest/autorest",
@@ -34,6 +34,10 @@
 			"ImportPath": "github.com/Azure/go-autorest/tracing",
 			"Rev": "v0.5.0"
 		},
+		{
+			"ImportPath": "github.com/BurntSushi/toml",
+			"Rev": "v0.3.1"
+		},
 		{
 			"ImportPath": "github.com/NYTimes/gziphandler",
 			"Rev": "56545f4a5d46"
@@ -54,6 +58,10 @@
 			"ImportPath": "github.com/blang/semver",
 			"Rev": "v3.5.0"
 		},
+		{
+			"ImportPath": "github.com/client9/misspell",
+			"Rev": "v0.3.4"
+		},
 		{
 			"ImportPath": "github.com/davecgh/go-spew",
 			"Rev": "v1.1.1"
@@ -110,17 +118,25 @@
 			"ImportPath": "github.com/gogo/protobuf",
 			"Rev": "65acae22fc9d"
 		},
+		{
+			"ImportPath": "github.com/golang/glog",
+			"Rev": "23def4e6c14b"
+		},
 		{
 			"ImportPath": "github.com/golang/groupcache",
 			"Rev": "02826c3e7903"
 		},
 		{
-			"ImportPath": "github.com/golang/protobuf",
+			"ImportPath": "github.com/golang/mock",
 			"Rev": "v1.2.0"
 		},
+		{
+			"ImportPath": "github.com/golang/protobuf",
+			"Rev": "v1.3.1"
+		},
 		{
 			"ImportPath": "github.com/google/btree",
-			"Rev": "7d79101e329e"
+			"Rev": "4030bb1f1f0c"
 		},
 		{
 			"ImportPath": "github.com/google/go-cmp",
@@ -130,10 +146,22 @@
 			"ImportPath": "github.com/google/gofuzz",
 			"Rev": "v1.0.0"
 		},
+		{
+			"ImportPath": "github.com/google/martian",
+			"Rev": "v2.1.0"
+		},
+		{
+			"ImportPath": "github.com/google/pprof",
+			"Rev": "3ea8567a2e57"
+		},
 		{
 			"ImportPath": "github.com/google/uuid",
 			"Rev": "v1.1.1"
 		},
+		{
+			"ImportPath": "github.com/googleapis/gax-go/v2",
+			"Rev": "v2.0.4"
+		},
 		{
 			"ImportPath": "github.com/googleapis/gnostic",
 			"Rev": "0c5108395e2d"
@@ -148,7 +176,7 @@
 		},
 		{
 			"ImportPath": "github.com/hashicorp/golang-lru",
-			"Rev": "v0.5.0"
+			"Rev": "v0.5.1"
 		},
 		{
 			"ImportPath": "github.com/hpcloud/tail",
@@ -162,6 +190,10 @@
 			"ImportPath": "github.com/json-iterator/go",
 			"Rev": "v1.1.7"
 		},
+		{
+			"ImportPath": "github.com/jstemmer/go-junit-report",
+			"Rev": "af01ea7f8024"
+		},
 		{
 			"ImportPath": "github.com/kisielk/errcheck",
 			"Rev": "v1.2.0"
@@ -254,10 +286,22 @@
 			"ImportPath": "github.com/stretchr/testify",
 			"Rev": "v1.3.0"
 		},
+		{
+			"ImportPath": "go.opencensus.io",
+			"Rev": "v0.21.0"
+		},
 		{
 			"ImportPath": "golang.org/x/crypto",
 			"Rev": "e84da0312774"
 		},
+		{
+			"ImportPath": "golang.org/x/exp",
+			"Rev": "509febef88a4"
+		},
+		{
+			"ImportPath": "golang.org/x/lint",
+			"Rev": "8f45f776aaf1"
+		},
 		{
 			"ImportPath": "golang.org/x/net",
 			"Rev": "cdfb69ac37fc"
@@ -284,12 +328,24 @@
 		},
 		{
 			"ImportPath": "golang.org/x/tools",
-			"Rev": "6c7e314b6563"
+			"Rev": "e65039ee4138"
+		},
+		{
+			"ImportPath": "google.golang.org/api",
+			"Rev": "v0.4.0"
 		},
 		{
 			"ImportPath": "google.golang.org/appengine",
 			"Rev": "v1.5.0"
 		},
+		{
+			"ImportPath": "google.golang.org/genproto",
+			"Rev": "e7d98fc518a7"
+		},
+		{
+			"ImportPath": "google.golang.org/grpc",
+			"Rev": "v1.19.0"
+		},
 		{
 			"ImportPath": "gopkg.in/check.v1",
 			"Rev": "788fd7840127"
@@ -310,21 +366,25 @@
 			"ImportPath": "gopkg.in/yaml.v2",
 			"Rev": "v2.2.2"
 		},
+		{
+			"ImportPath": "honnef.co/go/tools",
+			"Rev": "3f1c8253044a"
+		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "3efd428ce51b"
+			"Rev": "535404967fc8"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "620c521aba34"
+			"Rev": "35bd9ae31030"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "e0d2c14f19fa"
+			"Rev": "960df9c23167"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "73cfb6232c94"
+			"Rev": "b635e5567b37"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",

go.mod

@@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
 go 1.12
 
 require (
-	k8s.io/apimachinery v0.0.0
+	k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030
-	k8s.io/component-base v0.0.0
+	k8s.io/component-base v0.0.0-20190828155824-b635e5567b37
 )
 
 replace (
@@ -17,9 +17,8 @@ replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
 	golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
-	k8s.io/api => ../api
+	k8s.io/api => k8s.io/api v0.0.0-20190828114644-535404967fc8
-	k8s.io/apimachinery => ../apimachinery
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030
-	k8s.io/client-go => ../client-go
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190828155339-960df9c23167
-	k8s.io/component-base => ../component-base
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190828155824-b635e5567b37
-	k8s.io/kube-controller-manager => ../kube-controller-manager
 )

go.sum

@@ -150,6 +150,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/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-20190828114644-535404967fc8/go.mod h1:FQukhkwVOpEleIcV72hAUmhlQ4bTU+jINB0rwQOlkk0=
+k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030/go.mod h1:OOC7vMsHyCzra5xu6r1bRXkXMH76iww9BeHOAAJof4U=
+k8s.io/client-go v0.0.0-20190828155339-960df9c23167/go.mod h1:VtDnEQdjbHWYVE1s5RToeS51c3+aoDs/G83GsAGepcE=
+k8s.io/component-base v0.0.0-20190828155824-b635e5567b37/go.mod h1:/3z1c9T/H3yxg73FeGSphb1AFtPsLKKZr5twBgKLxTQ=
 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=