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

use format "range v := iterative object" and "range k, v := iterative

Browse source 
object" when the type of iterative object is slice and map in the file nginx.tmpl
This commit is contained in:
dongqi1990 2018-07-06 18:13:24 +08:00
parent 5827c981af
commit 50084b1167
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -370,7 +370,7 @@ http {
{{ end }} {{ end }}
{{ if not $all.DynamicConfigurationEnabled }} {{ if not $all.DynamicConfigurationEnabled }}
{{ range $name, $upstream := $backends }} {{ range $upstream := $backends }}
{{ if eq $upstream.SessionAffinity.AffinityType "cookie" }} {{ if eq $upstream.SessionAffinity.AffinityType "cookie" }}
upstream sticky-{{ $upstream.Name }} { upstream sticky-{{ $upstream.Name }} {
sticky hash={{ $upstream.SessionAffinity.CookieSessionAffinity.Hash }} name={{ $upstream.SessionAffinity.CookieSessionAffinity.Name }}{{if eq (len $upstream.SessionAffinity.CookieSessionAffinity.Locations) 1 }}{{ range $locationName, $locationPaths := $upstream.SessionAffinity.CookieSessionAffinity.Locations }}{{ if eq (len $locationPaths) 1 }} path={{ index $locationPaths 0 }}{{ end }}{{ end }}{{ end }} httponly; sticky hash={{ $upstream.SessionAffinity.CookieSessionAffinity.Hash }} name={{ $upstream.SessionAffinity.CookieSessionAffinity.Name }}{{if eq (len $upstream.SessionAffinity.CookieSessionAffinity.Locations) 1 }}{{ range $locationName, $locationPaths := $upstream.SessionAffinity.CookieSessionAffinity.Locations }}{{ if eq (len $locationPaths) 1 }} path={{ index $locationPaths 0 }}{{ end }}{{ end }}{{ end }} httponly;
@ -412,7 +412,7 @@ http {
{{ end }} {{ end }}
{{/* build the maps that will be use to validate the Whitelist */}} {{/* build the maps that will be use to validate the Whitelist */}}
{{ range $index, $server := $servers }} {{ range $server := $servers }}
{{ range $location := $server.Locations }} {{ range $location := $server.Locations }}
{{ $path := buildLocation $location }} {{ $path := buildLocation $location }}
@ -482,7 +482,7 @@ http {
} }
{{ end }} {{ end }}
{{ range $index, $server := $servers }} {{ range $server := $servers }}
## start server {{ $server.Hostname }} ## start server {{ $server.Hostname }}
server { server {
@ -597,9 +597,9 @@ stream {
error_log {{ $cfg.ErrorLogPath }}; error_log {{ $cfg.ErrorLogPath }};
# TCP services # TCP services
{{ range $i, $tcpServer := .TCPBackends }} {{ range $tcpServer := .TCPBackends }}
upstream tcp-{{ $tcpServer.Port }}-{{ $tcpServer.Backend.Namespace }}-{{ $tcpServer.Backend.Name }}-{{ $tcpServer.Backend.Port }} { upstream tcp-{{ $tcpServer.Port }}-{{ $tcpServer.Backend.Namespace }}-{{ $tcpServer.Backend.Name }}-{{ $tcpServer.Backend.Port }} {
{{ range $j, $endpoint := $tcpServer.Endpoints }} {{ range $endpoint := $tcpServer.Endpoints }}
server {{ $endpoint.Address | formatIP }}:{{ $endpoint.Port }}; server {{ $endpoint.Address | formatIP }}:{{ $endpoint.Port }};
{{ end }} {{ end }}
} }
@ -626,9 +626,9 @@ stream {
{{ end }} {{ end }}
# UDP services # UDP services
{{ range $i, $udpServer := .UDPBackends }} {{ range $udpServer := .UDPBackends }}
upstream udp-{{ $udpServer.Port }}-{{ $udpServer.Backend.Namespace }}-{{ $udpServer.Backend.Name }}-{{ $udpServer.Backend.Port }} { upstream udp-{{ $udpServer.Port }}-{{ $udpServer.Backend.Namespace }}-{{ $udpServer.Backend.Name }}-{{ $udpServer.Backend.Port }} {
{{ range $j, $endpoint := $udpServer.Endpoints }} {{ range $endpoint := $udpServer.Endpoints }}
server {{ $endpoint.Address | formatIP }}:{{ $endpoint.Port }}; server {{ $endpoint.Address | formatIP }}:{{ $endpoint.Port }};
{{ end }} {{ end }}
} }
@ -971,7 +971,7 @@ stream {
auth_request {{ $authPath }}; auth_request {{ $authPath }};
auth_request_set $auth_cookie $upstream_http_set_cookie; auth_request_set $auth_cookie $upstream_http_set_cookie;
add_header Set-Cookie $auth_cookie; add_header Set-Cookie $auth_cookie;
{{- range $idx, $line := buildAuthResponseHeaders $location }} {{- range $line := buildAuthResponseHeaders $location }}
{{ $line }} {{ $line }}
{{- end }} {{- end }}
{{ end }} {{ end }}