github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32231 from timothysc/re-re-http2

Browse Source 
Automatic merge from submit-queue

Default HTTP2 on, post fixes from #29001

This reverts commit 8cb799c789.

Enables HTTP2 on by default post fixes from https://github.com/kubernetes/kubernetes/issues/29001 for 1.5 

NOTE:  We are nearing lb connection limits at current thresholds. 

/cc @bradfitz @lavalamp @smarterclayton
This commit is contained in:
Kubernetes Submit Queue 2016-09-26 13:26:46 -07:00 committed by GitHub
commit 3efed287b4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/genericapiserver/genericapiserver.go
View File

@ -251,6 +251,9 @@ func (s *GenericAPIServer) Run(options *options.ServerRunOptions) {
secureServer.TLSConfig.ClientAuth = tls.RequestClientCert secureServer.TLSConfig.ClientAuth = tls.RequestClientCert
// Specify allowed CAs for client certificates // Specify allowed CAs for client certificates
secureServer.TLSConfig.ClientCAs = clientCAs secureServer.TLSConfig.ClientCAs = clientCAs
// "h2" NextProtos is necessary for enabling HTTP2 for go's 1.7 HTTP Server
secureServer.TLSConfig.NextProtos = []string{"h2"}
} }
glog.Infof("Serving securely on %s", secureLocation) glog.Infof("Serving securely on %s", secureLocation)

6
pkg/util/net/http.go
View File

@ -77,8 +77,10 @@ func SetOldTransportDefaults(t *http.Transport) *http.Transport {
// for the Proxy, Dial, and TLSHandshakeTimeout fields if unset // for the Proxy, Dial, and TLSHandshakeTimeout fields if unset
func SetTransportDefaults(t *http.Transport) *http.Transport { func SetTransportDefaults(t *http.Transport) *http.Transport {
t = SetOldTransportDefaults(t) t = SetOldTransportDefaults(t)
// Allow HTTP2 clients but default off for now // Allow clients to disable http2 if needed.
if s := os.Getenv("ENABLE_HTTP2"); len(s) > 0 { if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 {
glog.Infof("HTTP2 has been explicitly disabled")
} else {
if err := http2.ConfigureTransport(t); err != nil { if err := http2.ConfigureTransport(t); err != nil {
glog.Warningf("Transport failed http2 configuration: %v", err) glog.Warningf("Transport failed http2 configuration: %v", err)
} }