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

Merge pull request #304 from caiyixiang/changeSStoSSL

Browse source 
change 'buildSSPassthrouthUpstreams' to 'buildSSLPassthroughUpstreams'
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-02-20 08:00:15 -03:00 committed by GitHub
commit 463ff2b453
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/nginx/pkg/template/template.go
View file

@ -137,7 +137,7 @@ var (
"buildProxyPass": buildProxyPass, "buildProxyPass": buildProxyPass,
"buildRateLimitZones": buildRateLimitZones, "buildRateLimitZones": buildRateLimitZones,
"buildRateLimit": buildRateLimit, "buildRateLimit": buildRateLimit,
"buildSSPassthroughUpstreams": buildSSPassthroughUpstreams, "buildSSLPassthroughUpstreams": buildSSLPassthroughUpstreams,
"buildResolvers": buildResolvers, "buildResolvers": buildResolvers,
"isLocationAllowed": isLocationAllowed, "isLocationAllowed": isLocationAllowed,
"buildStreamUpstreams": buildStreamUpstreams, "buildStreamUpstreams": buildStreamUpstreams,
@ -171,7 +171,7 @@ func buildResolvers(a interface{}) string {
return strings.Join(r, " ") return strings.Join(r, " ")
} }
func buildSSPassthroughUpstreams(b interface{}, sslb interface{}) string { func buildSSLPassthroughUpstreams(b interface{}, sslb interface{}) string {
backends := b.([]*ingress.Backend) backends := b.([]*ingress.Backend)
sslBackends := sslb.([]*ingress.SSLPassthroughBackend) sslBackends := sslb.([]*ingress.SSLPassthroughBackend)
buf := bytes.NewBuffer(make([]byte, 0, 10)) buf := bytes.NewBuffer(make([]byte, 0, 10))

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

@ -446,7 +446,7 @@ stream {
server 127.0.0.1:442; server 127.0.0.1:442;
} }
{{ buildSSPassthroughUpstreams $backends .PassthroughBackends }} {{ buildSSLPassthroughUpstreams $backends .PassthroughBackends }}
server { server {
listen [::]:443 ipv6only=off{{ if $cfg.UseProxyProtocol }} proxy_protocol{{ end }}; listen [::]:443 ipv6only=off{{ if $cfg.UseProxyProtocol }} proxy_protocol{{ end }};