Fix proxying long polling requests.

Fixes #2039 This commit fixes long polling cases with teleport for K8s that did not work because flush was not called during io.Copy commands.
gravitational · Jun 29, 2018 · 026e8e4 · 026e8e4
1 parent a527cdb
commit 026e8e4
Show file tree

Hide file tree

Showing 6 changed files with 183 additions and 16 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -104,7 +104,7 @@ ignored = ["github.com/Sirupsen/logrus"]
   version = ">=0.0.2, <=1.0.0-gc98f59f"
 
 [[constraint]]
-  version = "1.0.1"
+  version = "1.0.2"
   name = "github.com/gravitational/oxy"
 
 [[constraint]]

diff --git a/lib/kube/proxy/forwarder.go b/lib/kube/proxy/forwarder.go
@@ -649,6 +649,7 @@ func (f *Forwarder) newClusterSession(ctx authContext) (*clusterSession, error)
 	tlsConfig.BuildNameToCertificate()
 
 	fwd, err := forward.New(
+		forward.FlushInterval(100*time.Millisecond),
 		forward.RoundTripper(f.newTransport(ctx.cluster.Dial, tlsConfig)),
 		forward.WebsocketDial(ctx.cluster.Dial),
 		forward.Logger(logrus.StandardLogger()),

diff --git a/vendor/github.com/gravitational/oxy/forward/flushcopy.go b/vendor/github.com/gravitational/oxy/forward/flushcopy.go
diff --git a/vendor/github.com/gravitational/oxy/forward/fwd.go b/vendor/github.com/gravitational/oxy/forward/fwd.go
diff --git a/vendor/github.com/gravitational/oxy/forward/fwd_test.go b/vendor/github.com/gravitational/oxy/forward/fwd_test.go