Added support for http2

nginx · Nov 15, 2016 · 76001b7 · 76001b7
1 parent 8e4dfa6
commit 76001b7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/examples/customization/nginx-config.yaml b/examples/customization/nginx-config.yaml
@@ -8,3 +8,4 @@ data:
   client-max-body-size: "2m" # default is "1m". See http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
   server-names-hash-bucket-size: "64" # default value depends on the size of the processor’s cache line. See http://nginx.org/en/docs/http/ngx_http_core_module.html#server_names_hash_bucket_size
   server-names-hash-max-size: "1024" # default is "512". See http://nginx.org/en/docs/http/ngx_http_core_module.html#server_names_hash_max_size
+  http2: 'True' # default is "False". Enables http2 in servers with SSL enabled. See https://nginx.org/en/docs/http/ngx_http_v2_module.html
diff --git a/nginx-controller/controller/controller.go b/nginx-controller/controller/controller.go
@@ -19,6 +19,7 @@ package controller
 import (
 	"fmt"
 	"reflect"
+	"strconv"
 	"strings"
 	"time"
 
@@ -321,6 +322,13 @@ func (lbc *LoadBalancerController) syncCfgm(key string) {
 		if serverNamesHashMaxSize, exists := cfgm.Data["server-names-hash-max-size"]; exists {
 			cfg.MainServerNamesHashMaxSize = serverNamesHashMaxSize
 		}
+		if HTTP2Str, exists := cfgm.Data["http2"]; exists {
+			if HTTP2, err := strconv.ParseBool(HTTP2Str); err == nil {
+				cfg.HTTP2 = HTTP2
+			} else {
+				glog.Errorf("In configmap %v/%v 'http2' contains invalid declaration: %v, ignoring", cfgm.Namespace, cfgm.Name, err)
+			}
+		}
 	}
 	lbc.cnf.UpdateConfig(cfg)
 

diff --git a/nginx-controller/nginx/config.go b/nginx-controller/nginx/config.go
@@ -5,6 +5,7 @@ type Config struct {
 	ProxyConnectTimeout           string
 	ProxyReadTimeout              string
 	ClientMaxBodySize             string
+	HTTP2                         bool
 	MainServerNamesHashBucketSize string
 	MainServerNamesHashMaxSize    string
 }

diff --git a/nginx-controller/nginx/configurator.go b/nginx-controller/nginx/configurator.go
@@ -2,6 +2,7 @@ package nginx
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 	"sync"
 
@@ -102,7 +103,10 @@ func (cnf *Configurator) generateNginxCfg(ingEx *IngressEx, pems map[string]stri
 			glog.Warningf("Host field of ingress rule in %v/%v is empty", ingEx.Ingress.Namespace, ingEx.Ingress.Name)
 		}
 
-		server := Server{Name: serverName}
+		server := Server{
+			Name:  serverName,
+			HTTP2: ingCfg.HTTP2,
+		}
 
 		if pemFile, ok := pems[serverName]; ok {
 			server.SSL = true
@@ -140,7 +144,10 @@ func (cnf *Configurator) generateNginxCfg(ingEx *IngressEx, pems map[string]stri
 	}
 
 	if len(ingEx.Ingress.Spec.Rules) == 0 && ingEx.Ingress.Spec.Backend != nil {
-		server := Server{Name: emptyHost}
+		server := Server{
+			Name:  emptyHost,
+			HTTP2: ingCfg.HTTP2,
+		}
 
 		if pemFile, ok := pems[emptyHost]; ok {
 			server.SSL = true
@@ -173,7 +180,13 @@ func (cnf *Configurator) createConfig(ingEx *IngressEx) Config {
 	if clientMaxBodySize, exists := ingEx.Ingress.Annotations["nginx.org/client-max-body-size"]; exists {
 		ingCfg.ClientMaxBodySize = clientMaxBodySize
 	}
-
+	if HTTP2Str, exists := ingEx.Ingress.Annotations["nginx.org/http2"]; exists {
+		if HTTP2, err := strconv.ParseBool(HTTP2Str); err == nil {
+			ingCfg.HTTP2 = HTTP2
+		} else {
+			glog.Errorf("In %v/%v nginx.org/http2 contains invalid declaration: %v, ignoring", ingEx.Ingress.Namespace, ingEx.Ingress.Name, err)
+		}
+	}
 	return ingCfg
 }
 

diff --git a/nginx-controller/nginx/ingress.tmpl b/nginx-controller/nginx/ingress.tmpl
@@ -8,7 +8,7 @@ upstream {{$upstream.Name}} {
 server {
 	listen 80;
 	{{if $server.SSL}}
-	listen 443 ssl;
+	listen 443 ssl{{if $server.HTTP2}} http2{{end}};
 	ssl_certificate {{$server.SSLCertificate}};
 	ssl_certificate_key {{$server.SSLCertificateKey}};
 	{{end}}

diff --git a/nginx-controller/nginx/nginx.go b/nginx-controller/nginx/nginx.go
@@ -43,6 +43,7 @@ type Server struct {
 	SSL               bool
 	SSLCertificate    string
 	SSLCertificateKey string
+	HTTP2             bool
 }
 
 // Location describes an NGINX location