Merge pull request #96 from justinsb/fix_typo

Fix typo PassthrougBackends -> PassthroughBackends
kubernetes · Dec 29, 2016 · 756b41b · 756b41b
2 parents fbe3ddc + fb8208c
commit 756b41b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -289,15 +289,15 @@ func (n NGINXController) OnUpdate(cmap *api.ConfigMap, ingressCfg ingress.Config
 	}
 
 	return n.t.Write(config.TemplateConfig{
-		BacklogSize:        sysctlSomaxconn(),
-		Backends:           ingressCfg.Backends,
-		PassthrougBackends: ingressCfg.PassthroughBackends,
-		Servers:            ingressCfg.Servers,
-		TCPBackends:        ingressCfg.TCPEndpoints,
-		UDPBackends:        ingressCfg.UPDEndpoints,
-		HealthzURI:         "/healthz",
-		CustomErrors:       len(cfg.CustomHTTPErrors) > 0,
-		Cfg:                cfg,
+		BacklogSize:         sysctlSomaxconn(),
+		Backends:            ingressCfg.Backends,
+		PassthroughBackends: ingressCfg.PassthroughBackends,
+		Servers:             ingressCfg.Servers,
+		TCPBackends:         ingressCfg.TCPEndpoints,
+		UDPBackends:         ingressCfg.UPDEndpoints,
+		HealthzURI:          "/healthz",
+		CustomErrors:        len(cfg.CustomHTTPErrors) > 0,
+		Cfg:                 cfg,
 	}, n.testTemplate)
 }
 

diff --git a/controllers/nginx/pkg/config/config.go b/controllers/nginx/pkg/config/config.go
@@ -268,7 +268,7 @@ func NewDefault() Configuration {
 type TemplateConfig struct {
 	BacklogSize        int
 	Backends           []*ingress.Backend
-	PassthrougBackends []*ingress.SSLPassthroughBackend
+	PassthroughBackends []*ingress.SSLPassthroughBackend
 	Servers            []*ingress.Server
 	TCPBackends        []*ingress.Location
 	UDPBackends        []*ingress.Location

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -399,7 +399,7 @@ http {
 stream {
     # map FQDN that requires SSL passthrough
     map $ssl_preread_server_name $stream_upstream {
-        {{ range $i, $passthrough := .PassthrougBackends }}
+        {{ range $i, $passthrough := .PassthroughBackends }}
         {{ $passthrough.Hostname }}         {{  $passthrough.Backend }};
         {{ end }}
         # send SSL traffic to this nginx in a different port 
@@ -416,7 +416,7 @@ stream {
         server 127.0.0.1:442;
     }
 
-    {{ buildSSPassthroughUpstreams $backends .PassthrougBackends }}
+    {{ buildSSPassthroughUpstreams $backends .PassthroughBackends }}
 
     server {
         listen                  [::]:443 ipv6only=off;

diff --git a/controllers/nginx/test/data/config.json b/controllers/nginx/test/data/config.json
@@ -45,7 +45,7 @@
 	"customErrors": true,
 	"defResolver": "",
 	"healthzURI": "/healthz",
-	"passthrougBackends": [{
+	"passthroughBackends": [{
 		"namespace": "default-kubernetes-443",
 		"hostname": "foo-898.bar.com"
 	}, {