Merge pull request kubernetes#96 from Shopify/sync-upstream

Sync upstream
hnrytrn · Aug 8, 2018 · 534b5e2 · 534b5e2
2 parents 823ed43 + 373ee9b
commit 534b5e2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
@@ -523,9 +523,8 @@ http {
 
  # default server, used for NGINX healthcheck and access to nginx stats
  server {
- # Use the port {{ $all.ListenPorts.Status }} (random value just to avoid known ports) as default port for nginx.
- listen 127.0.0.1:{{ $all.ListenPorts.Status }} default_server {{ if $all.Cfg.ReusePort }}reuseport{{ end }} backlog={{ $all.BacklogSize }};
- {{ if $IsIPV6Enabled }}listen [::1]:{{ $all.ListenPorts.Status }} default_server {{ if $all.Cfg.ReusePort }}reuseport{{ end }} backlog={{ $all.BacklogSize }};{{ end }}
+ listen {{ $all.ListenPorts.Status }} default_server {{ if $all.Cfg.ReusePort }}reuseport{{ end }} backlog={{ $all.BacklogSize }};
+ {{ if $IsIPV6Enabled }}listen [::]:{{ $all.ListenPorts.Status }} default_server {{ if $all.Cfg.ReusePort }}reuseport{{ end }} backlog={{ $all.BacklogSize }};{{ end }}
  set $proxy_upstream_name "-";
 
  location {{ $healthzURI }} {