From baf6e105e806c04d5cf75a7eb116350a0bfa9ed7 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Mon, 29 Mar 2021 09:22:46 -0700
Subject: [PATCH] Merge pull request #100501 from
 joelsmith/automated-cherry-pick-of-#98477-upstream-release-1.20

[1.20] Automated cherry pick of #98477: update gogo/protobuf to v1.3.2

Kubernetes-commit: 67f7cc9db9f07c9fb10dadf5911af72dd9a57be1
---
 Godeps/Godeps.json | 28 ++++++++++++++++------------
 go.mod             | 21 ++++++++++-----------
 go.sum             |  7 +++++++
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8a1d3ae..e026905 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -296,7 +296,7 @@
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf",
-			"Rev": "v1.3.1"
+			"Rev": "v1.3.2"
 		},
 		{
 			"ImportPath": "github.com/golang/glog",
@@ -484,7 +484,7 @@
 		},
 		{
 			"ImportPath": "github.com/kisielk/errcheck",
-			"Rev": "v1.2.0"
+			"Rev": "v1.5.0"
 		},
 		{
 			"ImportPath": "github.com/kisielk/gotool",
@@ -742,6 +742,10 @@
 			"ImportPath": "github.com/xiang90/probing",
 			"Rev": "43a291ad63a2"
 		},
+		{
+			"ImportPath": "github.com/yuin/goldmark",
+			"Rev": "v1.2.1"
+		},
 		{
 			"ImportPath": "go.etcd.io/bbolt",
 			"Rev": "v1.3.5"
@@ -788,7 +792,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/mod",
-			"Rev": "v0.2.0"
+			"Rev": "v0.3.0"
 		},
 		{
 			"ImportPath": "golang.org/x/net",
@@ -800,7 +804,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sync",
-			"Rev": "cd5d95a43a6e"
+			"Rev": "67f06af15bc9"
 		},
 		{
 			"ImportPath": "golang.org/x/sys",
@@ -816,7 +820,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/tools",
-			"Rev": "95d2e580d8eb"
+			"Rev": "113979e3529a"
 		},
 		{
 			"ImportPath": "golang.org/x/xerrors",
@@ -908,31 +912,31 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "d610c6e6c135"
+			"Rev": "4cbcd86ea749"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "2641dba65d8c"
+			"Rev": "640a6275d2b0"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver",
-			"Rev": "7d08ac32c4b9"
+			"Rev": "395cee214d8e"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "717704b917f6"
+			"Rev": "720ea497dc06"
 		},
 		{
 			"ImportPath": "k8s.io/cloud-provider",
-			"Rev": "8dddb027dd30"
+			"Rev": "c1f652b0cba3"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "bf590380a8b5"
+			"Rev": "e1576f54c4ca"
 		},
 		{
 			"ImportPath": "k8s.io/controller-manager",
-			"Rev": "1bdeab643fcb"
+			"Rev": "a6f40fb491b6"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 307aeea..7022bd2 100644
--- a/go.mod
+++ b/go.mod
@@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
 go 1.15
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/cloud-provider v0.0.0
-	k8s.io/controller-manager v0.0.0
+	k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
+	k8s.io/cloud-provider v0.0.0-20210329205730-c1f652b0cba3
+	k8s.io/controller-manager v0.0.0-20210329205405-a6f40fb491b6
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/cloud-provider => ../cloud-provider
-	k8s.io/component-base => ../component-base
-	k8s.io/controller-manager => ../controller-manager
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/api => k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210329200458-395cee214d8e
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210329194426-720ea497dc06
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210329205730-c1f652b0cba3
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210329195309-e1576f54c4ca
+	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210329205405-a6f40fb491b6
 )
diff --git a/go.sum b/go.sum
index f30f1d6..46beebe 100644
--- a/go.sum
+++ b/go.sum
@@ -586,6 +586,13 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 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=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.0.0-20210329192759-4cbcd86ea749/go.mod h1:cgILOv2D1tPmboo8I/DGUMNkV0C3JtN5aAEYvcTyKQc=
+k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
+k8s.io/apiserver v0.0.0-20210329200458-395cee214d8e/go.mod h1:OORuX3x2IIO92Bj0kYiJ5RUkxHQHRbh0zT/dc9SXxdM=
+k8s.io/client-go v0.0.0-20210329194426-720ea497dc06/go.mod h1:1C1ztLCJQP6JaCIcN/gJ4tjQI5EDBsuD3fQ6wQCY17I=
+k8s.io/cloud-provider v0.0.0-20210329205730-c1f652b0cba3/go.mod h1:SLrXcab6pUZ/8JLxMUf+3/AmM5x4m7TWhXCIflspMP8=
+k8s.io/component-base v0.0.0-20210329195309-e1576f54c4ca/go.mod h1:0GA/S/qw95GXEDv164YZl1I0s52DVkqcWMi9gskopDo=
+k8s.io/controller-manager v0.0.0-20210329205405-a6f40fb491b6/go.mod h1:HRXGnGiMjJIKodO53f6eoan+I0aUB6vVTTlqVTnyHwM=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=