From bcebd5c5abbec47f8ad50d0affc48c12ecfc113d Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 29 Jan 2021 08:09:40 -0800
Subject: [PATCH] Merge pull request #98565 from adisky/move-spdystream

Move dependency docker/spdystream to moby/spdystream

Kubernetes-commit: 64a6ee4321d37740b84a5c5c7aaa67e0bf6b6508
---
 Godeps/Godeps.json | 22 +++++++++++-----------
 go.mod             | 21 ++++++++++-----------
 go.sum             |  7 +++++++
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 28e8149..1bfac4b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -206,10 +206,6 @@
 			"ImportPath": "github.com/dgryski/go-sip13",
 			"Rev": "e10d5fee7954"
 		},
-		{
-			"ImportPath": "github.com/docker/spdystream",
-			"Rev": "449fdfce4d96"
-		},
 		{
 			"ImportPath": "github.com/docopt/docopt-go",
 			"Rev": "ee0de3bc6815"
@@ -562,6 +558,10 @@
 			"ImportPath": "github.com/mitchellh/mapstructure",
 			"Rev": "v1.1.2"
 		},
+		{
+			"ImportPath": "github.com/moby/spdystream",
+			"Rev": "v0.2.0"
+		},
 		{
 			"ImportPath": "github.com/moby/term",
 			"Rev": "672ec06f55cd"
@@ -908,31 +908,31 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "fcac651617f2"
+			"Rev": "cfb031d9922e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "15c5dba13c59"
+			"Rev": "d656fe577b19"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver",
-			"Rev": "c6d0a8d87770"
+			"Rev": "47ff55d998a3"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "0964d4be7536"
+			"Rev": "c8e0107904fe"
 		},
 		{
 			"ImportPath": "k8s.io/cloud-provider",
-			"Rev": "22476e0b4bdf"
+			"Rev": "4ca940629641"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "e05af43f81e2"
+			"Rev": "090761b6f2fb"
 		},
 		{
 			"ImportPath": "k8s.io/controller-manager",
-			"Rev": "1369de462388"
+			"Rev": "19ec3c9b65a4"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 307aeea..822914b 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-20210129200846-d656fe577b19
+	k8s.io/cloud-provider v0.0.0-20210129203701-4ca940629641
+	k8s.io/controller-manager v0.0.0-20210129203603-19ec3c9b65a4
 )
 
 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-20210129201028-cfb031d9922e
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210129202051-47ff55d998a3
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210129203701-4ca940629641
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb
+	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210129203603-19ec3c9b65a4
 )
diff --git a/go.sum b/go.sum
index 46fa4f0..d43fce1 100644
--- a/go.sum
+++ b/go.sum
@@ -646,6 +646,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-20210129201028-cfb031d9922e/go.mod h1:53ABT5N3hbUIrqvj8AtqG/pdaa+rfxmCsKQ2aRBQ4ZU=
+k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19/go.mod h1:Zn8td2uhRkPcF1lQatcpuW4aZakbEeCk1Zz0TKhD3zQ=
+k8s.io/apiserver v0.0.0-20210129202051-47ff55d998a3/go.mod h1:m8TGBZy2vHRH0oU5i5oGuvmndzftriHn6SRgSc83GsE=
+k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe/go.mod h1:qptrXnBIECLVceUzdc+pr0sppAlf+G0kKxYEcOROS0o=
+k8s.io/cloud-provider v0.0.0-20210129203701-4ca940629641/go.mod h1:eDqx/dkGGCgKX73gYhBVHN7moE+EEmpsBYXERtNdjQI=
+k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb/go.mod h1:zCJsv7PRwbJGJ9/R0dUiIa/m6rA9AWiquiM2VGykxSI=
+k8s.io/controller-manager v0.0.0-20210129203603-19ec3c9b65a4/go.mod h1:Sisf/5mERFVdjmKGDlohyFa75Hp54hYaQ+lZIb+LQMc=
 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=