From f983218c803f4c0bce41e24aec3deb87f2a16980 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sat, 18 Jan 2020 13:01:36 -0800
Subject: [PATCH] Merge pull request #87081 from
 dims/updating-protobuf-and-grpc

Updating protobuf (v1.3.1) and grpc (v1.26.0)

Kubernetes-commit: f4b6b751cdf2d46940355359443b263cb883d006
---
 Godeps/Godeps.json | 10 +++++-----
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0c5b9421..674dc824 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -108,7 +108,7 @@
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf",
-			"Rev": "65acae22fc9d"
+			"Rev": "v1.3.1"
 		},
 		{
 			"ImportPath": "github.com/golang/glog",
@@ -348,19 +348,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "9bd6c7846cc9"
+			"Rev": "7aecbd569fd4"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "fb4ce0f53438"
+			"Rev": "b615468efe04"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "1aa326d7304e"
+			"Rev": "a432bd9ba7da"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "ff19ea5b1bbd"
+			"Rev": "48228b4f418f"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 28bfe5d9..1d89a511 100644
--- a/go.mod
+++ b/go.mod
@@ -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-20200118233722-7aecbd569fd4
+	k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04
+	k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da
+	k8s.io/code-generator v0.0.0-20200118233344-48228b4f418f
 	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-20200118233722-7aecbd569fd4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200118233344-48228b4f418f
 )
diff --git a/go.sum b/go.sum
index b6749aaf..79299dc5 100644
--- a/go.sum
+++ b/go.sum
@@ -210,6 +210,10 @@ gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/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-20200118233722-7aecbd569fd4/go.mod h1:iTnrvplu5Iag9UUDHF5+igjjHk++6USiI3t2qaW2bX8=
+k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04/go.mod h1:j05cPXobKCShrrgR2gz+Wsw3flBA+nvUoLQLo1PdydY=
+k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da/go.mod h1:q/VkAWSNaZSYCIh4i2xT6kRRgshtiFdeLxxVK/4Y+9w=
+k8s.io/code-generator v0.0.0-20200118233344-48228b4f418f/go.mod h1:1Bsaqodc1TFZRb+hdtaQ1SJWc5RIkLIT9ZxThIv2S7M=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=