Merge pull request #100952 from saschagrunert/automated-cherry-pick-of-#99839-upstream-release-1.20

Automated cherry pick of #99839: Cleanup portforward streams after their usage

Kubernetes-commit: 516dfa59e61eee0b01ac6f8be6b0ebca61ca4ad5

Author: k8s-publishing-bot

Godeps/Godeps.json

@@ -26,14 +26,14 @@ require (
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
-	k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
+	k8s.io/api v0.0.0-20210408104456-f223af846001
+	k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
+	k8s.io/api => k8s.io/api v0.0.0-20210408104456-f223af846001
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1
 )

go.mod

@@ -425,8 +425,10 @@ 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/api v0.0.0-20210408104456-f223af846001 h1:z7zzwcnLO3xF6MWfhWuy9fiLC3E8quPHy5GGkNive6o=
+k8s.io/api v0.0.0-20210408104456-f223af846001/go.mod h1:cgILOv2D1tPmboo8I/DGUMNkV0C3JtN5aAEYvcTyKQc=
+k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1 h1:VxG2x5Wzg4GT/ghqOscTlJx6CFBMNHR7bC6/IaFiZB4=
+k8s.io/apimachinery v0.0.0-20210518101034-c278689d1bc1/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
 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=