Make exec timeout configurable (#803)

* make exec timeout configurable
This commit is contained in:
Weidong Cai
2020-01-19 04:11:54 +08:00
committed by Brian Goff
parent 4162bba465
commit 0bdf742303
5 changed files with 101 additions and 18 deletions

View File

@@ -16,6 +16,7 @@ package api
import (
"net/http"
"time"
"github.com/gorilla/mux"
"github.com/virtual-kubelet/virtual-kubelet/log"
@@ -33,9 +34,11 @@ type ServeMux interface {
}
type PodHandlerConfig struct {
RunInContainer ContainerExecHandlerFunc
GetContainerLogs ContainerLogsHandlerFunc
GetPods PodListerFunc
RunInContainer ContainerExecHandlerFunc
GetContainerLogs ContainerLogsHandlerFunc
GetPods PodListerFunc
StreamIdleTimeout time.Duration
StreamCreationTimeout time.Duration
}
// PodHandler creates an http handler for interacting with pods/containers.
@@ -47,8 +50,16 @@ func PodHandler(p PodHandlerConfig, debug bool) http.Handler {
if debug {
r.HandleFunc("/runningpods/", HandleRunningPods(p.GetPods)).Methods("GET")
}
r.HandleFunc("/containerLogs/{namespace}/{pod}/{container}", HandleContainerLogs(p.GetContainerLogs)).Methods("GET")
r.HandleFunc("/exec/{namespace}/{pod}/{container}", HandleContainerExec(p.RunInContainer)).Methods("POST")
r.HandleFunc(
"/exec/{namespace}/{pod}/{container}",
HandleContainerExec(
p.RunInContainer,
WithExecStreamCreationTimeout(p.StreamCreationTimeout),
WithExecStreamIdleTimeout(p.StreamIdleTimeout),
),
).Methods("POST")
r.NotFoundHandler = http.HandlerFunc(NotFound)
return r
}