From eafb1890d6876866aef82f1f947f60ac06ad9877 Mon Sep 17 00:00:00 2001 From: Dmitry Stolyarov Date: Thu, 10 May 2018 00:50:55 +0300 Subject: [PATCH] Move vars to the very beginning of the location To make it more clear, that you could use $namespace, $ingress_name and $service_name variables anywhere in location (especialy in lua), move their definition to the very begining of the location. --- rootfs/etc/nginx/template/nginx.tmpl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index c258ab2e3..86c8ed5a0 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -833,6 +833,11 @@ stream { {{ end }} location {{ $path }} { + {{ $ing := (getIngressInformation $location.Ingress $location.Path) }} + set $namespace "{{ $ing.Namespace }}"; + set $ingress_name "{{ $ing.Rule }}"; + set $service_name "{{ $ing.Service }}"; + {{ if not $all.DisableLua }} rewrite_by_lua_block { {{ if $all.DynamicConfigurationEnabled}} @@ -912,12 +917,6 @@ stream { set $proxy_upstream_name "{{ buildUpstreamName $server.Hostname $all.Backends $location $all.DynamicConfigurationEnabled }}"; - {{ $ing := (getIngressInformation $location.Ingress $location.Path) }} - {{/* $ing.Metadata contains the Ingress metadata */}} - set $namespace "{{ $ing.Namespace }}"; - set $ingress_name "{{ $ing.Rule }}"; - set $service_name "{{ $ing.Service }}"; - {{/* redirect to HTTPS can be achieved forcing the redirect or having a SSL Certificate configured for the server */}} {{ if (or $location.Rewrite.ForceSSLRedirect (and (not (empty $server.SSLCertificate)) $location.Rewrite.SSLRedirect)) }} {{ if not (isLocationInLocationList $location $all.Cfg.NoTLSRedirectLocations) }}