From fb8208cf8bdbb985d1bc5a1065b3e0212f8b5836 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 29 Dec 2016 17:57:51 -0500 Subject: [PATCH] Fix typo PassthrougBackends -> PassthroughBackends --- controllers/nginx/pkg/cmd/controller/nginx.go | 18 +++++++++--------- controllers/nginx/pkg/config/config.go | 2 +- .../nginx/rootfs/etc/nginx/template/nginx.tmpl | 4 ++-- controllers/nginx/test/data/config.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go index 9e7bd2202..cd9d48a79 100644 --- 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 index 8afeca499..a2ad73155 100644 --- 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 index ac3754b78..431cec403 100644 --- 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 index 8f0881978..938a97fb6 100644 --- 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" }, {