From b63b1ba7e44fe5910cda90c2e80c7a89b35ea7e7 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 4 Jun 2021 09:52:39 -0700
Subject: [PATCH] Merge pull request #102587 from saschagrunert/release-1.21

Revert "Cleanup portforward streams after their usage" [1.21]

Kubernetes-commit: e6824bbd0c2a669a049cc54f6e3d824d43b84f5f
---
 Godeps/Godeps.json | 2 +-
 go.mod             | 4 ++--
 go.sum             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 39900d3d6..42ca567f9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -480,7 +480,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "1a7b32ce3b15"
+			"Rev": "235edae7dd90"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 1cafa6b3a..ece4defc2 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	k8s.io/api v0.0.0-20210521231242-b96220531b73
-	k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
+	k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.0
@@ -37,5 +37,5 @@ require (
 
 replace (
 	k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90
 )
diff --git a/go.sum b/go.sum
index 8acfa6f71..8379eafb8 100644
--- a/go.sum
+++ b/go.sum
@@ -433,8 +433,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.0.0-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no=
 k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM=
-k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4=
-k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
+k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90 h1:3VEyPqxm8EiEYB39RqGjuz6gHkxGECKCiGF+SyLI6QE=
+k8s.io/apimachinery v0.0.0-20210604165239-235edae7dd90/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
 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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=