Merge pull request #696 from donaldguy/nginx-no-sni

[nginx] pass non-SNI TLS hello to default backend, Fixes #693
kubernetes · May 9, 2017 · 433220d · 433220d
2 parents 4601775 + 2d1b6dc
commit 433220d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -83,7 +83,13 @@ func newNGINXController() ingress.Controller {
 		configmap:     &api_v1.ConfigMap{},
 		isIPV6Enabled: isIPv6Enabled(),
 		resolver:      h,
-		proxy:         &proxy{},
+		proxy: &proxy{
+			Default: &server{
+				Hostname: "localhost",
+				IP:       "127.0.0.1",
+				Port:     442,
+			},
+		},
 	}
 
 	listener, err := net.Listen("tcp", ":443")

diff --git a/controllers/nginx/pkg/cmd/controller/tcp.go b/controllers/nginx/pkg/cmd/controller/tcp.go
@@ -27,11 +27,7 @@ func (p *proxy) Get(host string) *server {
 		}
 	}
 
-	return &server{
-		Hostname: "localhost",
-		IP:       "127.0.0.1",
-		Port:     442,
-	}
+	return p.Default
 }
 
 func (p *proxy) Handle(conn net.Conn) {