Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partially revert #30248 #31945

Merged
merged 1 commit into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/kube/proxy/responsewriters/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func (w *WatcherResponseWriter) watchDecoder(contentType string, writer io.Write
// wait for events received from upstream until the connection is terminated.
for {
eventType, obj, err := w.decodeStreamingMessage(streamingDecoder, objectDecoder)
if errors.Is(err, io.EOF) {
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrClosedPipe) {
return nil
} else if err != nil {
return trace.Wrap(err)
Expand Down
13 changes: 8 additions & 5 deletions lib/kube/proxy/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,14 @@ func NewTLSServer(cfg TLSServerConfig) (*TLSServer, error) {
Server: &http.Server{
Handler: httplib.MakeTracingHandler(limiter, teleport.ComponentKube),
ReadHeaderTimeout: apidefaults.DefaultIOTimeout * 2,
ReadTimeout: apidefaults.DefaultIOTimeout,
WriteTimeout: apidefaults.DefaultIOTimeout,
IdleTimeout: apidefaults.DefaultIdleTimeout,
TLSConfig: cfg.TLS,
ConnState: ingress.HTTPConnStateReporter(ingress.Kube, cfg.IngressReporter),
// Setting ReadTimeout and WriteTimeout will cause the server to
// terminate long running requests. This will cause issues with
// long running watch streams. The server will close the connection
// and the client will receive incomplete data and will fail to
// parse it.
IdleTimeout: apidefaults.DefaultIdleTimeout,
TLSConfig: cfg.TLS,
ConnState: ingress.HTTPConnStateReporter(ingress.Kube, cfg.IngressReporter),
ConnContext: func(ctx context.Context, c net.Conn) context.Context {
return utils.ClientAddrContext(ctx, c.RemoteAddr(), c.LocalAddr())
},
Expand Down
3 changes: 2 additions & 1 deletion lib/kube/proxy/utils_testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ func SetupTestContext(ctx context.Context, t *testing.T, cfg TestConfig) *TestCo
Log: log,
})
require.NoError(t, err)

require.Equal(t, testCtx.KubeServer.Server.ReadTimeout, time.Duration(0), "kube server write timeout must be 0")
require.Equal(t, testCtx.KubeServer.Server.WriteTimeout, time.Duration(0), "kube server write timeout must be 0")
// Waits for len(clusters) heartbeats to start
waitForHeartbeats := len(cfg.Clusters)

Expand Down