From 57180cc0526445806112ff6197e8f1d0fe924370 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Mon, 18 May 2020 23:09:36 -0700
Subject: [PATCH] Merge pull request #90582 from
 RainbowMango/pr_bump_client_golang_1_6

bump client_golang to v1.6.0

Kubernetes-commit: 78f2c8f70d66dd5c64697418d034429b3ebd9dce
---
 Godeps/Godeps.json | 36 ++++++++++++++++++++++--------------
 go.mod             | 13 ++++++-------
 go.sum             |  4 ++++
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 457802d..c47ff2e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -80,15 +80,15 @@
 		},
 		{
 			"ImportPath": "github.com/alecthomas/template",
-			"Rev": "a0175ee3bccc"
+			"Rev": "fb15b899a751"
 		},
 		{
 			"ImportPath": "github.com/alecthomas/units",
-			"Rev": "2efee857e7cf"
+			"Rev": "c3de453c63f4"
 		},
 		{
 			"ImportPath": "github.com/beorn7/perks",
-			"Rev": "v1.0.0"
+			"Rev": "v1.0.1"
 		},
 		{
 			"ImportPath": "github.com/blang/semver",
@@ -98,6 +98,10 @@
 			"ImportPath": "github.com/census-instrumentation/opencensus-proto",
 			"Rev": "v0.2.1"
 		},
+		{
+			"ImportPath": "github.com/cespare/xxhash/v2",
+			"Rev": "v2.1.1"
+		},
 		{
 			"ImportPath": "github.com/chzyer/logex",
 			"Rev": "v1.1.10"
@@ -164,11 +168,11 @@
 		},
 		{
 			"ImportPath": "github.com/go-kit/kit",
-			"Rev": "v0.8.0"
+			"Rev": "v0.9.0"
 		},
 		{
 			"ImportPath": "github.com/go-logfmt/logfmt",
-			"Rev": "v0.3.0"
+			"Rev": "v0.4.0"
 		},
 		{
 			"ImportPath": "github.com/go-logr/logr",
@@ -212,7 +216,7 @@
 		},
 		{
 			"ImportPath": "github.com/golang/protobuf",
-			"Rev": "v1.3.3"
+			"Rev": "v1.4.2"
 		},
 		{
 			"ImportPath": "github.com/google/btree",
@@ -272,7 +276,7 @@
 		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
-			"Rev": "v1.1.8"
+			"Rev": "v1.1.9"
 		},
 		{
 			"ImportPath": "github.com/jstemmer/go-junit-report",
@@ -364,7 +368,7 @@
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang",
-			"Rev": "v1.0.0"
+			"Rev": "v1.6.0"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_model",
@@ -372,11 +376,11 @@
 		},
 		{
 			"ImportPath": "github.com/prometheus/common",
-			"Rev": "v0.4.1"
+			"Rev": "v0.9.1"
 		},
 		{
 			"ImportPath": "github.com/prometheus/procfs",
-			"Rev": "v0.0.5"
+			"Rev": "v0.0.11"
 		},
 		{
 			"ImportPath": "github.com/rogpeppe/go-internal",
@@ -478,6 +482,10 @@
 			"ImportPath": "google.golang.org/grpc",
 			"Rev": "v1.26.0"
 		},
+		{
+			"ImportPath": "google.golang.org/protobuf",
+			"Rev": "v1.23.0"
+		},
 		{
 			"ImportPath": "gopkg.in/alecthomas/kingpin.v2",
 			"Rev": "v2.2.6"
@@ -520,19 +528,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "2490600588fc"
+			"Rev": "2543aba0e237"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "561e5e9b265b"
+			"Rev": "bdcc9f4ab675"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "3d5c80942cce"
+			"Rev": "455d6109ca5a"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "89c8525861a7"
+			"Rev": "12ba2a45814f"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 3df9cca..2ebcc09 100644
--- a/go.mod
+++ b/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-20200519081849-bdcc9f4ab675
+	k8s.io/component-base v0.0.0-20200519083002-12ba2a45814f
 )
 
 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-20200519082056-2543aba0e237
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200519081849-bdcc9f4ab675
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200519082352-455d6109ca5a
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200519083002-12ba2a45814f
 )
diff --git a/go.sum b/go.sum
index f05578c..7194407 100644
--- a/go.sum
+++ b/go.sum
@@ -297,6 +297,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+k8s.io/api v0.0.0-20200519082056-2543aba0e237/go.mod h1:Q6M7crZfx9Kr6X36KdNV/vN9ZDm0zhlCbCjafx7a6LY=
+k8s.io/apimachinery v0.0.0-20200519081849-bdcc9f4ab675/go.mod h1:x4z2+k1N0YTBvV8PmaVs4/hSmKVVENZmTqI8gBygpLA=
+k8s.io/client-go v0.0.0-20200519082352-455d6109ca5a/go.mod h1:W03QwuLhhPiLylOWFu/BMCXaDC77nM8xbDCKJjznnUE=
+k8s.io/component-base v0.0.0-20200519083002-12ba2a45814f/go.mod h1:tYLN997JY3hznJ7qSWssZM+B9cySp/egeGP6PP8ZpBM=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=