From 59aac73785911444c1fe1eda295af2497b5f3382 Mon Sep 17 00:00:00 2001 From: Dmitry Stolyarov Date: Thu, 10 May 2018 00:59:58 +0300 Subject: [PATCH] Add $service_port variable According to TCP/IP (and common sense), $service_name is not enough to uniquely identify service, we need $service_port for that. --- rootfs/etc/nginx/template/nginx.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 86c8ed5a0..3c2b58e49 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -182,6 +182,7 @@ http { # $namespace # $ingress_name # $service_name + # $service_port log_format upstreaminfo {{ if $cfg.LogFormatEscapeJSON }}escape=json {{ end }}'{{ buildLogFormatUpstream $cfg }}'; {{/* map urls that should not appear in access.log */}} @@ -663,6 +664,7 @@ stream { proxy_set_header X-Namespace $namespace; proxy_set_header X-Ingress-Name $ingress_name; proxy_set_header X-Service-Name $service_name; + proxy_set_header X-Service-Port $service_port; rewrite (.*) / break; @@ -837,6 +839,7 @@ stream { set $namespace "{{ $ing.Namespace }}"; set $ingress_name "{{ $ing.Rule }}"; set $service_name "{{ $ing.Service }}"; + set $service_port "{{ $location.Port }}"; {{ if not $all.DisableLua }} rewrite_by_lua_block { @@ -1090,6 +1093,7 @@ stream { proxy_set_header X-Namespace $namespace; proxy_set_header X-Ingress-Name $ingress_name; proxy_set_header X-Service-Name $service_name; + proxy_set_header X-Service-Port $service_port; {{ end }} {{ if not (empty $location.Backend) }}