Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
5454dbb242 Update dependencies to v0.19.13-rc.0 tag 2021-06-17 22:13:46 +00:00
Kubernetes Publisher
16f4fb3dbb Merge pull request #102588 from saschagrunert/release-1.19
Revert "Cleanup portforward streams after their usage" [1.19]

Kubernetes-commit: f1bbe359f4ee98a54412ff1f80f9ae3537a5e28c
2021-06-04 20:02:37 +00:00
Sascha Grunert
402f834d7a Revert "Cleanup portforward streams after their usage"
This reverts commit a1ee076d5f4a3965afe43d0bc23096dfdc170448.

A regression has been introduced with this patch. The strategy is to
apply the fix on master and revert on the release branches.

Kubernetes-commit: 21900bc5f5c64850507b18e9fe9533019116f0c3
2021-06-04 08:57:28 +02:00
4 changed files with 10 additions and 13 deletions

4
Godeps/Godeps.json generated
View File

@@ -444,11 +444,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "v0.19.11"
"Rev": "60680b5087d3"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "v0.19.11"
"Rev": "7556458a5d8e"
},
{
"ImportPath": "k8s.io/gengo",

8
go.mod
View File

@@ -26,14 +26,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
k8s.io/api v0.19.11
k8s.io/apimachinery v0.19.11
k8s.io/api v0.19.13-rc.0
k8s.io/apimachinery v0.19.13-rc.0
k8s.io/klog/v2 v2.2.0
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => k8s.io/api v0.19.11
k8s.io/apimachinery => k8s.io/apimachinery v0.19.11
k8s.io/api => k8s.io/api v0.19.13-rc.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.13-rc.0
)

8
go.sum
View File

@@ -334,10 +334,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.19.11 h1:d02ByDs0X0dTLogq7GVJDueD5BwaPkJ7w6zJJsBfH50=
k8s.io/api v0.19.11/go.mod h1:NDC7FqmmQkLylzifqzU+5/+gccsbvoC0m4957WSBR8c=
k8s.io/apimachinery v0.19.11 h1:elcwUwz0jtMGWSCXCCdDyP014NB9oYpqh0l6PkxxUIs=
k8s.io/apimachinery v0.19.11/go.mod h1:9eb44nUQSsz9QZiilFRuMj3ZbTmoWolU8S2gnXoRMjo=
k8s.io/api v0.19.13-rc.0 h1:01AMncaTljY5nHE7rn2XuLM+0Y7+KUG/UDPe3b/+WNk=
k8s.io/api v0.19.13-rc.0/go.mod h1:MRQfP/7NsumdnNSOs+4rzjmAxi1gVBBfie1vr7nK1po=
k8s.io/apimachinery v0.19.13-rc.0 h1:d/xMK8Sw+N/5tCvi7yQO0zkogiILE9q5JK6tS6Q+2iM=
k8s.io/apimachinery v0.19.13-rc.0/go.mod h1:9eb44nUQSsz9QZiilFRuMj3ZbTmoWolU8S2gnXoRMjo=
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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=

View File

@@ -68,9 +68,6 @@ func (c *fakeConnection) CloseChan() <-chan bool {
return c.closeChan
}
func (c *fakeConnection) RemoveStreams(_ ...httpstream.Stream) {
}
func (c *fakeConnection) SetIdleTimeout(timeout time.Duration) {
// no-op
}