Merge pull request #25280 from timothysc/http2_clients

Automatic merge from submit-queue Option to enable http2 on client connections. Addresses #21081 Enables http2 connection by default. before: ``` Active Internet connections (servers and established) Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name tcp 0 0 127.0.0.1:10248 0.0.0.0:* LISTEN 21868/kubelet tcp 0 0 127.0.0.1:10249 0.0.0.0:* LISTEN 21924/kube-proxy tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN 754/sshd tcp 0 0 192.2.5.12:47080 192.2.5.11:443 ESTABLISHED 21924/kube-proxy tcp 0 0 192.2.5.12:47082 192.2.5.11:443 ESTABLISHED 21924/kube-proxy tcp 0 0 192.2.5.12:55776 169.254.169.254:80 ESTABLISHED 21868/kubelet tcp 0 304 192.2.5.12:22 192.2.5.10:49978 ESTABLISHED 22287/sshd: root [p tcp 0 0 192.2.5.12:34568 192.2.5.11:2379 ESTABLISHED 3029/flanneld tcp 0 0 192.2.5.12:55774 169.254.169.254:80 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:47086 192.2.5.11:443 ESTABLISHED 21924/kube-proxy tcp 0 0 192.2.5.12:47102 192.2.5.11:443 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:47108 192.2.5.11:443 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:55772 169.254.169.254:80 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:47104 192.2.5.11:443 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:34718 192.2.5.11:2379 ESTABLISHED 3029/flanneld tcp 0 0 192.2.5.12:47110 192.2.5.11:443 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:47106 192.2.5.11:443 ESTABLISHED 21868/kubelet tcp 0 0 192.2.5.12:47084 192.2.5.11:443 ESTABLISHED 21924/kube-proxy tcp6 0 0 :::4194 :::* LISTEN 21868/kubelet tcp6 0 0 :::10250 :::* LISTEN 21868/kubelet tcp6 0 0 :::10255 :::* LISTEN 21868/kubelet tcp6 0 0 :::22 :::* LISTEN 754/sshd tcp6 0 0 192.2.5.12:10255 192.2.5.15:41570 ESTABLISHED 21868/kubelet udp 0 0 0.0.0.0:8472 0.0.0.0:* - udp 0 0 0.0.0.0:22824 0.0.0.0:* 600/dhclient udp 0 0 0.0.0.0:68 0.0.0.0:* 600/dhclient udp6 0 0 :::4195 :::* 600/dhclient ``` after ``` Active Internet connections (servers and established) Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name tcp 0 0 127.0.0.1:10248 0.0.0.0:* LISTEN 16962/kubelet tcp 0 0 127.0.0.1:10249 0.0.0.0:* LISTEN 17024/kube-proxy tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN 754/sshd tcp 0 0 192.2.5.12:47046 192.2.5.11:443 ESTABLISHED 17024/kube-proxy tcp 0 0 192.2.5.12:47052 192.2.5.11:443 ESTABLISHED 16962/kubelet tcp 0 0 192.2.5.12:34568 192.2.5.11:2379 ESTABLISHED 3029/flanneld tcp 0 0 192.2.5.12:55720 169.254.169.254:80 ESTABLISHED 16962/kubelet tcp 0 0 192.2.5.12:55724 169.254.169.254:80 ESTABLISHED 16962/kubelet tcp 0 0 192.2.5.12:34718 192.2.5.11:2379 ESTABLISHED 3029/flanneld tcp 0 0 192.2.5.12:55726 169.254.169.254:80 ESTABLISHED 16962/kubelet tcp 0 304 192.2.5.12:22 192.2.5.10:49938 ESTABLISHED 17653/sshd: root [p tcp6 0 0 :::4194 :::* LISTEN 16962/kubelet tcp6 0 0 :::10250 :::* LISTEN 16962/kubelet tcp6 0 0 :::10255 :::* LISTEN 16962/kubelet tcp6 0 0 :::22 :::* LISTEN 754/sshd tcp6 0 0 192.2.5.12:10255 192.2.5.15:41472 ESTABLISHED 16962/kubelet udp 0 0 0.0.0.0:8472 0.0.0.0:* - udp 0 0 0.0.0.0:22824 0.0.0.0:* 600/dhclient udp 0 0 0.0.0.0:68 0.0.0.0:* 600/dhclient udp6 0 0 :::4195 :::* 600/dhclient ``` /cc @jeremyeder
kubernetes · Jun 6, 2016 · 2cc0f2f · 2cc0f2f
2 parents fd2dee8 + 199e15a
commit 2cc0f2f
Show file tree

Hide file tree

Showing 31 changed files with 3,521 additions and 757 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/kubelet/client/kubelet_client.go b/pkg/kubelet/client/kubelet_client.go
@@ -72,7 +72,7 @@ func MakeTransport(config *KubeletClientConfig) (http.RoundTripper, error) {
 
 	rt := http.DefaultTransport
 	if config.Dial != nil || tlsConfig != nil {
-		rt = utilnet.SetTransportDefaults(&http.Transport{
+		rt = utilnet.SetOldTransportDefaults(&http.Transport{
 			Dial:            config.Dial,
 			TLSClientConfig: tlsConfig,
 		})

diff --git a/pkg/util/net/http.go b/pkg/util/net/http.go
@@ -26,6 +26,9 @@ import (
 	"os"
 	"strconv"
 	"strings"
+
+	"github.com/golang/glog"
+	"golang.org/x/net/http2"
 )
 
 // IsProbableEOF returns true if the given error resembles a connection termination
@@ -53,9 +56,9 @@ func IsProbableEOF(err error) bool {
 
 var defaultTransport = http.DefaultTransport.(*http.Transport)
 
-// SetTransportDefaults applies the defaults from http.DefaultTransport
+// SetOldTransportDefaults applies the defaults from http.DefaultTransport
 // for the Proxy, Dial, and TLSHandshakeTimeout fields if unset
-func SetTransportDefaults(t *http.Transport) *http.Transport {
+func SetOldTransportDefaults(t *http.Transport) *http.Transport {
 	if t.Proxy == nil || isDefault(t.Proxy) {
 		// http.ProxyFromEnvironment doesn't respect CIDRs and that makes it impossible to exclude things like pod and service IPs from proxy settings
 		// ProxierWithNoProxyCIDR allows CIDR rules in NO_PROXY
@@ -70,6 +73,19 @@ func SetTransportDefaults(t *http.Transport) *http.Transport {
 	return t
 }
 
+// SetTransportDefaults applies the defaults from http.DefaultTransport
+// for the Proxy, Dial, and TLSHandshakeTimeout fields if unset
+func SetTransportDefaults(t *http.Transport) *http.Transport {
+	t = SetOldTransportDefaults(t)
+	// Allow HTTP2 clients but default off for now
+	if s := os.Getenv("ENABLE_HTTP2"); len(s) > 0 {
+		if err := http2.ConfigureTransport(t); err != nil {
+			glog.Warningf("Transport failed http2 configuration: %v", err)
+		}
+	}
+	return t
+}
+
 type RoundTripperWrapper interface {
 	http.RoundTripper
 	WrappedRoundTripper() http.RoundTripper

diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
diff --git a/vendor/golang.org/x/net/context/ctxhttp/cancelreq.go b/vendor/golang.org/x/net/context/ctxhttp/cancelreq.go
diff --git a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
diff --git a/vendor/golang.org/x/net/http2/Dockerfile b/vendor/golang.org/x/net/http2/Dockerfile
diff --git a/vendor/golang.org/x/net/http2/README b/vendor/golang.org/x/net/http2/README
diff --git a/vendor/golang.org/x/net/http2/buffer.go b/vendor/golang.org/x/net/http2/buffer.go