diff --git a/go.mod b/go.mod index 96709bd9..444779a4 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( golang.org/x/term v0.17.0 golang.org/x/time v0.3.0 google.golang.org/protobuf v1.31.0 - k8s.io/api v0.0.0-20240305005446-44e99ab012f3 + k8s.io/api v0.0.0-20240305044758-77dcab116670 k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3 k8s.io/klog/v2 v2.120.1 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -61,6 +61,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20240305005446-44e99ab012f3 + k8s.io/api => k8s.io/api v0.0.0-20240305044758-77dcab116670 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3 ) diff --git a/go.sum b/go.sum index c6d10c1a..9b0a3b10 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.0.0-20240305005446-44e99ab012f3 h1:kObw+Ii/uysUS4kFid2GeA/Ly0mKZMR0atFtzNShkYo= -k8s.io/api v0.0.0-20240305005446-44e99ab012f3/go.mod h1:LqWcRHARWAsGJzkb3VILGPRpvszhYI3gMjIZrqO6MMo= +k8s.io/api v0.0.0-20240305044758-77dcab116670 h1:HKNA0r/MvsZumLV9wDGOxNVNh/9/gMNEM6Svs1OSJUo= +k8s.io/api v0.0.0-20240305044758-77dcab116670/go.mod h1:vubRQCvGk3ZRs8VJewbBCTFfaSYNGtDSO4rI+Ur8d0M= k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3 h1:OQnlxechgbZid21Q0KyffHDuHHZz+G7RTGDA3SIkC+o= k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3/go.mod h1:qPsrq6INURDMMgqxK78MEuC8GzI1f2oHvfHzg5ZOa6s= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= diff --git a/tools/remotecommand/websocket.go b/tools/remotecommand/websocket.go index e6e893a1..1dc679cb 100644 --- a/tools/remotecommand/websocket.go +++ b/tools/remotecommand/websocket.go @@ -38,7 +38,7 @@ import ( // writeDeadline defines the time that a client-side write to the websocket // connection must complete before an i/o timeout occurs. -const writeDeadline = 30 * time.Second +const writeDeadline = 60 * time.Second var ( _ Executor = &wsStreamExecutor{} @@ -61,8 +61,8 @@ const ( // "pong" message before a timeout error occurs for websocket reading. // This duration must always be greater than the "pingPeriod". By defining // this deadline in terms of the ping period, we are essentially saying - // we can drop "X-1" (e.g. 6-1=5) pings before firing the timeout. - pingReadDeadline = (pingPeriod * 6) + (1 * time.Second) + // we can drop "X" (e.g. 12) pings before firing the timeout. + pingReadDeadline = (pingPeriod * 12) + (1 * time.Second) ) // wsStreamExecutor handles transporting standard shell streams over an httpstream connection.