diff --git a/internal/configs/version1/nginx-plus.ingress.tmpl b/internal/configs/version1/nginx-plus.ingress.tmpl index eec61ca468..68dbd13e4e 100644 --- a/internal/configs/version1/nginx-plus.ingress.tmpl +++ b/internal/configs/version1/nginx-plus.ingress.tmpl @@ -3,7 +3,9 @@ {{- range $upstream := .Upstreams}} upstream {{$upstream.Name}} { zone {{$upstream.Name}} {{if ne $upstream.UpstreamZoneSize "0"}}{{$upstream.UpstreamZoneSize}}{{else}}512k{{end}}; - {{- if $upstream.LBMethod }}{{$upstream.LBMethod}};{{end}} + {{- if $upstream.LBMethod }} + {{$upstream.LBMethod}}; + {{- end}} {{- range $server := $upstream.UpstreamServers}} server {{$server.Address}} max_fails={{$server.MaxFails}} fail_timeout={{$server.FailTimeout}} max_conns={{$server.MaxConns}} {{- if $server.SlowStart}} slow_start={{$server.SlowStart}}{{end}}{{if $server.Resolve}} resolve{{end}};{{end}} diff --git a/internal/configs/version1/nginx.ingress.tmpl b/internal/configs/version1/nginx.ingress.tmpl index 02f46cbf37..9bc197e0a9 100644 --- a/internal/configs/version1/nginx.ingress.tmpl +++ b/internal/configs/version1/nginx.ingress.tmpl @@ -3,7 +3,9 @@ {{- range $upstream := .Upstreams}} upstream {{$upstream.Name}} { {{- if ne $upstream.UpstreamZoneSize "0"}}zone {{$upstream.Name}} {{$upstream.UpstreamZoneSize}};{{end}} - {{- if $upstream.LBMethod }}{{$upstream.LBMethod}};{{end}} + {{- if $upstream.LBMethod }} + {{$upstream.LBMethod}}; + {{- end}} {{- range $server := $upstream.UpstreamServers}} server {{$server.Address}} max_fails={{$server.MaxFails}} fail_timeout={{$server.FailTimeout}} max_conns={{$server.MaxConns}};{{end}} {{- if $.Keepalive}}keepalive {{$.Keepalive}};{{end}} diff --git a/internal/configs/version2/nginx-plus.transportserver.tmpl b/internal/configs/version2/nginx-plus.transportserver.tmpl index f3e47b3a42..94c0c9c81f 100644 --- a/internal/configs/version2/nginx-plus.transportserver.tmpl +++ b/internal/configs/version2/nginx-plus.transportserver.tmpl @@ -2,7 +2,6 @@ {{- range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} 256k; - {{- if $u.LoadBalancingMethod }} {{ $u.LoadBalancingMethod }}; {{- end }} diff --git a/internal/configs/version2/nginx-plus.virtualserver.tmpl b/internal/configs/version2/nginx-plus.virtualserver.tmpl index 2f6a3faa59..a1c8d10fa4 100644 --- a/internal/configs/version2/nginx-plus.virtualserver.tmpl +++ b/internal/configs/version2/nginx-plus.virtualserver.tmpl @@ -2,8 +2,9 @@ {{ range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} {{ if ne $u.UpstreamZoneSize "0" }}{{ $u.UpstreamZoneSize }}{{ else }}512k{{ end }}; - - {{- if $u.LBMethod }}{{ $u.LBMethod }};{{ end }} + {{- if $u.LBMethod }} + {{ $u.LBMethod }}; + {{- end }} {{- range $s := $u.Servers }} server {{ $s.Address }} max_fails={{ $u.MaxFails }} fail_timeout={{ $u.FailTimeout }}{{ if $u.SlowStart }} slow_start={{ $u.SlowStart }}{{ end }} max_conns={{ $u.MaxConns }}{{ if $u.Resolve }} resolve{{ end }}; @@ -114,7 +115,7 @@ server { ssl_certificate_key {{ makeSecretPath "/etc/nginx/secrets/spiffe_key.pem" $.StaticSSLPath "$secret_dir_path" $.DynamicSSLReloadEnabled }}; {{- else }} ssl_certificate {{ makeSecretPath $ssl.Certificate $.StaticSSLPath "$secret_dir_path" $.DynamicSSLReloadEnabled }}; - ssl_certificate_key {{ makeSecretPath $ssl.CertificateKey $.StaticSSLPath "$secret_dir_path" $.DynamicSSLReloadEnabled }}; + ssl_certificate_key {{ makeSecretPath $ssl.CertificateKey $.StaticSSLPath "$secret_dir_path" $.DynamicSSLReloadEnabled }}; {{- end }} {{- else }} {{- if $.SpiffeCerts }} diff --git a/internal/configs/version2/nginx.transportserver.tmpl b/internal/configs/version2/nginx.transportserver.tmpl index 15f0a97fd0..248d0dc7b7 100644 --- a/internal/configs/version2/nginx.transportserver.tmpl +++ b/internal/configs/version2/nginx.transportserver.tmpl @@ -2,7 +2,6 @@ {{- range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} 256k; - {{- if $u.LoadBalancingMethod }} {{ $u.LoadBalancingMethod }}; {{- end }} diff --git a/internal/configs/version2/nginx.virtualserver.tmpl b/internal/configs/version2/nginx.virtualserver.tmpl index da6fa1985a..65db798d09 100644 --- a/internal/configs/version2/nginx.virtualserver.tmpl +++ b/internal/configs/version2/nginx.virtualserver.tmpl @@ -2,8 +2,9 @@ {{ range $u := .Upstreams }} upstream {{ $u.Name }} { {{- if ne $u.UpstreamZoneSize "0" }}zone {{ $u.Name }} {{ $u.UpstreamZoneSize }};{{ end }} - - {{- if $u.LBMethod }}{{ $u.LBMethod }};{{ end }} + {{- if $u.LBMethod }} + {{ $u.LBMethod }}; + {{- end }} {{- range $s := $u.Servers }} server {{ $s.Address }} max_fails={{ $u.MaxFails }} fail_timeout={{ $u.FailTimeout }} max_conns={{ $u.MaxConns }};