From b9f76a914f5a2809200a6da58b197e59114f56c3 Mon Sep 17 00:00:00 2001
From: Radek Pieczonka <goblin@pentex.pl>
Date: Thu, 14 Apr 2016 09:08:13 +0200
Subject: [PATCH 1/2] adds headers for X-Real-IP and X-Forwarded-For to
 correctly pass origin IP address to backend svc

---
 nginx-controller/nginx/ingress.tmpl      | 2 ++
 nginx-plus-controller/nginx/ingress.tmpl | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nginx-controller/nginx/ingress.tmpl b/nginx-controller/nginx/ingress.tmpl
index d64a8d8b6c..5f16493240 100644
--- a/nginx-controller/nginx/ingress.tmpl
+++ b/nginx-controller/nginx/ingress.tmpl
@@ -24,6 +24,8 @@ server {
 	{{range $location := $server.Locations}}
   location {{$location.Path}} {
     proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://{{$location.Upstream.Name}};
   }{{end}}
 }{{end}}
diff --git a/nginx-plus-controller/nginx/ingress.tmpl b/nginx-plus-controller/nginx/ingress.tmpl
index bb4964522b..65d9001bdd 100644
--- a/nginx-plus-controller/nginx/ingress.tmpl
+++ b/nginx-plus-controller/nginx/ingress.tmpl
@@ -27,6 +27,8 @@ server {
 	{{range $location := $server.Locations}}
   location {{$location.Path}} {
     proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://{{$location.Upstream.Name}};
   }{{end}}
 }{{end}}

From 6c1b0bfd12c59e278f5e47e6b1423e4ce9071d11 Mon Sep 17 00:00:00 2001
From: Radek Pieczonka <goblin@pentex.pl>
Date: Thu, 14 Apr 2016 22:37:46 +0200
Subject: [PATCH 2/2] adds X-Forwarded-Host, X-Forwarded-Port and
 X-Forwarded-Proto

---
 nginx-controller/nginx/ingress.tmpl      | 3 +++
 nginx-plus-controller/nginx/ingress.tmpl | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nginx-controller/nginx/ingress.tmpl b/nginx-controller/nginx/ingress.tmpl
index 5f16493240..91e900c369 100644
--- a/nginx-controller/nginx/ingress.tmpl
+++ b/nginx-controller/nginx/ingress.tmpl
@@ -26,6 +26,9 @@ server {
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Forwarded-Port $server_port;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_pass http://{{$location.Upstream.Name}};
   }{{end}}
 }{{end}}
diff --git a/nginx-plus-controller/nginx/ingress.tmpl b/nginx-plus-controller/nginx/ingress.tmpl
index 65d9001bdd..58b5e0b988 100644
--- a/nginx-plus-controller/nginx/ingress.tmpl
+++ b/nginx-plus-controller/nginx/ingress.tmpl
@@ -29,6 +29,9 @@ server {
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Forwarded-Port $server_port;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_pass http://{{$location.Upstream.Name}};
   }{{end}}
 }{{end}}