github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

add env var to allow disabling the aggregated discovery timeout

Browse Source
This commit is contained in:
David Eads 2019-08-29 13:28:38 -04:00
parent aaebd67a63
commit 2f1f997c08
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go
View File

@ -20,6 +20,8 @@ import (
"context" "context"
"net/http" "net/http"
"net/url" "net/url"
"os"
"strconv"
"strings" "strings"
"sync/atomic" "sync/atomic"
"time" "time"
@ -29,6 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/httpstream/spdy" "k8s.io/apimachinery/pkg/util/httpstream/spdy"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/proxy" "k8s.io/apimachinery/pkg/util/proxy"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
endpointmetrics "k8s.io/apiserver/pkg/endpoints/metrics" endpointmetrics "k8s.io/apiserver/pkg/endpoints/metrics"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
@ -47,6 +50,19 @@ const (
aggregatedDiscoveryTimeout = 5 * time.Second aggregatedDiscoveryTimeout = 5 * time.Second
) )
var (
// TODO this should be unconditionally true once we remove the env var override
enableAggregatedDiscoveryTimeout = true
)
func init() {
disableAggregatedDiscoveryTimeout, err := strconv.ParseBool(os.Getenv("DEPRECATED_DISABLE_AGGREGATOR_DISCOVERY_TIMEOUT"))
if err != nil {
utilruntime.HandleError(err)
}
enableAggregatedDiscoveryTimeout = !disableAggregatedDiscoveryTimeout
}
// proxyHandler provides a http.Handler which will proxy traffic to locations // proxyHandler provides a http.Handler which will proxy traffic to locations
// specified by items implementing Redirector. // specified by items implementing Redirector.
type proxyHandler struct { type proxyHandler struct {
@ -185,7 +201,7 @@ func newRequestForProxy(location *url.URL, req *http.Request) (*http.Request, co
// trim leading and trailing slashes. Then "/apis/group/version" requests are for discovery, so if we have exactly three // trim leading and trailing slashes. Then "/apis/group/version" requests are for discovery, so if we have exactly three
// segments that we are going to proxy, we have a discovery request. // segments that we are going to proxy, we have a discovery request.
} else if len(strings.Split(strings.Trim(req.URL.Path, "/"), "/")) == 3 { } else if enableAggregatedDiscoveryTimeout && len(strings.Split(strings.Trim(req.URL.Path, "/"), "/")) == 3 {
// discovery requests are used by kubectl and others to determine which resources a server has. This is a cheap call that // discovery requests are used by kubectl and others to determine which resources a server has. This is a cheap call that
// should be fast for every aggregated apiserver. Latency for aggregation is expected to be low (as for all extensions) // should be fast for every aggregated apiserver. Latency for aggregation is expected to be low (as for all extensions)
// so forcing a short timeout here helps responsiveness of all clients. // so forcing a short timeout here helps responsiveness of all clients.