github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-23 13:47:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123679 from seans3/remotecommand-extend-deadlines

Browse Source 
Extend deadlines to one minute

Kubernetes-commit: 0bcf6e3ddee25621428017e135ce04879b32e659
This commit is contained in:
Kubernetes Publisher 2024-03-04 18:38:32 -08:00
commit 6810f4fa0d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -24,7 +24,7 @@ require (
golang.org/x/term v0.17.0 golang.org/x/term v0.17.0
golang.org/x/time v0.3.0 golang.org/x/time v0.3.0
google.golang.org/protobuf v1.31.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/apimachinery v0.0.0-20240305011844-67cb3a878cd3
k8s.io/klog/v2 v2.120.1 k8s.io/klog/v2 v2.120.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
@ -61,6 +61,6 @@ require (
) )
replace ( 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 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3
) )

4
go.sum
View File

@ -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.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 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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-20240305044758-77dcab116670 h1:HKNA0r/MvsZumLV9wDGOxNVNh/9/gMNEM6Svs1OSJUo=
k8s.io/api v0.0.0-20240305005446-44e99ab012f3/go.mod h1:LqWcRHARWAsGJzkb3VILGPRpvszhYI3gMjIZrqO6MMo= 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 h1:OQnlxechgbZid21Q0KyffHDuHHZz+G7RTGDA3SIkC+o=
k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3/go.mod h1:qPsrq6INURDMMgqxK78MEuC8GzI1f2oHvfHzg5ZOa6s= k8s.io/apimachinery v0.0.0-20240305011844-67cb3a878cd3/go.mod h1:qPsrq6INURDMMgqxK78MEuC8GzI1f2oHvfHzg5ZOa6s=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=

6
tools/remotecommand/websocket.go
View File

@ -38,7 +38,7 @@ import (
// writeDeadline defines the time that a client-side write to the websocket // writeDeadline defines the time that a client-side write to the websocket
// connection must complete before an i/o timeout occurs. // connection must complete before an i/o timeout occurs.
const writeDeadline = 30 * time.Second const writeDeadline = 60 * time.Second
var ( var (
_ Executor = &wsStreamExecutor{} _ Executor = &wsStreamExecutor{}
@ -61,8 +61,8 @@ const (
// "pong" message before a timeout error occurs for websocket reading. // "pong" message before a timeout error occurs for websocket reading.
// This duration must always be greater than the "pingPeriod". By defining // This duration must always be greater than the "pingPeriod". By defining
// this deadline in terms of the ping period, we are essentially saying // 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. // we can drop "X" (e.g. 12) pings before firing the timeout.
pingReadDeadline = (pingPeriod * 6) + (1 * time.Second) pingReadDeadline = (pingPeriod * 12) + (1 * time.Second)
) )
// wsStreamExecutor handles transporting standard shell streams over an httpstream connection. // wsStreamExecutor handles transporting standard shell streams over an httpstream connection.