DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typo PassthrougBackends -> PassthroughBackends

Browse source
This commit is contained in:
Justin Santa Barbara 2016-12-29 17:57:51 -05:00
parent 8e90fc0290
commit fb8208cf8b
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -289,15 +289,15 @@ func (n NGINXController) OnUpdate(cmap *api.ConfigMap, ingressCfg ingress.Config
} }
return n.t.Write(config.TemplateConfig{ return n.t.Write(config.TemplateConfig{
BacklogSize: sysctlSomaxconn(), BacklogSize: sysctlSomaxconn(),
Backends: ingressCfg.Backends, Backends: ingressCfg.Backends,
PassthrougBackends: ingressCfg.PassthroughBackends, PassthroughBackends: ingressCfg.PassthroughBackends,
Servers: ingressCfg.Servers, Servers: ingressCfg.Servers,
TCPBackends: ingressCfg.TCPEndpoints, TCPBackends: ingressCfg.TCPEndpoints,
UDPBackends: ingressCfg.UPDEndpoints, UDPBackends: ingressCfg.UPDEndpoints,
HealthzURI: "/healthz", HealthzURI: "/healthz",
CustomErrors: len(cfg.CustomHTTPErrors) > 0, CustomErrors: len(cfg.CustomHTTPErrors) > 0,
Cfg: cfg, Cfg: cfg,
}, n.testTemplate) }, n.testTemplate)
} }

2
controllers/nginx/pkg/config/config.go
View file

@ -268,7 +268,7 @@ func NewDefault() Configuration {
type TemplateConfig struct { type TemplateConfig struct {
BacklogSize int BacklogSize int
Backends []*ingress.Backend Backends []*ingress.Backend
PassthrougBackends []*ingress.SSLPassthroughBackend PassthroughBackends []*ingress.SSLPassthroughBackend
Servers []*ingress.Server Servers []*ingress.Server
TCPBackends []*ingress.Location TCPBackends []*ingress.Location
UDPBackends []*ingress.Location UDPBackends []*ingress.Location

4
controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
View file

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

2
controllers/nginx/test/data/config.json
View file

@ -45,7 +45,7 @@
"customErrors": true, "customErrors": true,
"defResolver": "", "defResolver": "",
"healthzURI": "/healthz", "healthzURI": "/healthz",
"passthrougBackends": [{ "passthroughBackends": [{
"namespace": "default-kubernetes-443", "namespace": "default-kubernetes-443",
"hostname": "foo-898.bar.com" "hostname": "foo-898.bar.com"
}, { }, {