From 8c46953115620a5a8635fae97c0dd2dda3f7ad7e Mon Sep 17 00:00:00 2001
From: tosih <sohail@runnable.com>
Date: Tue, 16 May 2017 11:01:19 -0700
Subject: [PATCH] Update gamma ingres proxy k8 configs.

---
 .../ingress-proxy-sites-enabled-config        | 84 ++++++++++++++-----
 1 file changed, 61 insertions(+), 23 deletions(-)

diff --git a/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config b/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config
index 39b39544..7c84002c 100644
--- a/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config
+++ b/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config
@@ -62,7 +62,7 @@ data:
       '' close;
     }
 
-    upstream api {
+    upstream api_base {
       server api:80 max_fails=0 fail_timeout=1s;
     }
 
@@ -73,7 +73,7 @@ data:
       access_log /var/log/nginx/api.access.log;
 
       location / {
-        proxy_pass http://api;
+        proxy_pass http://api_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -85,6 +85,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
 
     server {
@@ -112,12 +113,11 @@ data:
       resolver_timeout 5s;
 
       location / {
-        proxy_pass http://api;
+        proxy_pass http://api_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
 
-
         proxy_set_header Host $http_host;
         proxy_set_header x-forwarded-host $http_host;
         proxy_set_header x-real-ip $remote_addr;
@@ -125,6 +125,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
   drake.conf: |
     map $http_upgrade $connection_upgrade {
@@ -132,7 +133,7 @@ data:
       '' close;
     }
 
-    upstream drake {
+    upstream drake_base {
       server drake:80 max_fails=0 fail_timeout=1s;
     }
 
@@ -143,7 +144,7 @@ data:
       access_log /var/log/nginx/drake.access.log;
 
       location / {
-        proxy_pass http://drake;
+        proxy_pass http://drake_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -155,6 +156,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
 
     server {
@@ -182,12 +184,11 @@ data:
       resolver_timeout 5s;
 
       location / {
-        proxy_pass http://drake;
+        proxy_pass http://drake_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
 
-
         proxy_set_header Host $http_host;
         proxy_set_header x-forwarded-host $http_host;
         proxy_set_header x-real-ip $remote_addr;
@@ -195,6 +196,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
   optimus.conf: |
     map $http_upgrade $connection_upgrade {
@@ -202,7 +204,7 @@ data:
       '' close;
     }
 
-    upstream optimus {
+    upstream optimus_base {
       server optimus:80 max_fails=0 fail_timeout=1s;
     }
 
@@ -213,7 +215,7 @@ data:
       access_log /var/log/nginx/optimus.access.log;
 
       location / {
-        proxy_pass http://optimus;
+        proxy_pass http://optimus_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -225,6 +227,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
 
     server {
@@ -252,12 +255,11 @@ data:
       resolver_timeout 5s;
 
       location / {
-        proxy_pass http://optimus;
+        proxy_pass http://optimus_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
 
-
         proxy_set_header Host $http_host;
         proxy_set_header x-forwarded-host $http_host;
         proxy_set_header x-real-ip $remote_addr;
@@ -265,6 +267,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
   apisock.conf: |
     map $http_upgrade $connection_upgrade {
@@ -272,7 +275,7 @@ data:
       '' close;
     }
 
-    upstream apisock {
+    upstream apisock_base {
       server apisock:80 max_fails=0 fail_timeout=1s;
     }
 
@@ -283,7 +286,7 @@ data:
       access_log /var/log/nginx/apisock.access.log;
 
       location / {
-        proxy_pass http://apisock;
+        proxy_pass http://apisock_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -295,6 +298,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
 
     server {
@@ -322,12 +326,11 @@ data:
       resolver_timeout 5s;
 
       location / {
-        proxy_pass http://apisock;
+        proxy_pass http://apisock_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
 
-
         proxy_set_header Host $http_host;
         proxy_set_header x-forwarded-host $http_host;
         proxy_set_header x-real-ip $remote_addr;
@@ -335,6 +338,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
   eru.conf: |
     map $http_upgrade $connection_upgrade {
@@ -342,10 +346,14 @@ data:
       '' close;
     }
 
-    upstream eru {
+    upstream eru_base {
       server eru:5501 max_fails=0 fail_timeout=1s;
     }
 
+    upstream eru_graphql {
+      server eru:5502 max_fails=0 fail_timeout=1s;
+    }
+
     server {
       listen 80;
       client_max_body_size 5g;
@@ -353,7 +361,21 @@ data:
       access_log /var/log/nginx/eru.access.log;
 
       location / {
-        proxy_pass http://eru;
+        proxy_pass http://eru_base;
+        proxy_http_version 1.1;
+        proxy_set_header upgrade $http_upgrade;
+        proxy_set_header connection $connection_upgrade;
+
+        proxy_set_header Host $http_host;
+        proxy_set_header x-forwarded-host $http_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-protocol $scheme;
+        proxy_set_header x-forwarded-proto $scheme;
+      }
+
+      location /graphql {
+        proxy_pass http://eru_graphql;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -365,6 +387,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
 
     server {
@@ -392,11 +415,24 @@ data:
       resolver_timeout 5s;
 
       location / {
-        proxy_pass http://eru;
+        proxy_pass http://eru_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
 
+        proxy_set_header Host $http_host;
+        proxy_set_header x-forwarded-host $http_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-protocol $scheme;
+        proxy_set_header x-forwarded-proto $scheme;
+      }
+
+      location /graphql {
+        proxy_pass http://eru_graphql;
+        proxy_http_version 1.1;
+        proxy_set_header upgrade $http_upgrade;
+        proxy_set_header connection $connection_upgrade;
 
         proxy_set_header Host $http_host;
         proxy_set_header x-forwarded-host $http_host;
@@ -405,6 +441,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
   egret.conf: |
     map $http_upgrade $connection_upgrade {
@@ -412,7 +449,7 @@ data:
       '' close;
     }
 
-    upstream egret {
+    upstream egret_base {
       server egret:65520 max_fails=0 fail_timeout=1s;
     }
 
@@ -423,7 +460,7 @@ data:
       access_log /var/log/nginx/egret.access.log;
 
       location / {
-        proxy_pass http://egret;
+        proxy_pass http://egret_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -435,6 +472,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
 
     server {
@@ -462,12 +500,11 @@ data:
       resolver_timeout 5s;
 
       location / {
-        proxy_pass http://egret;
+        proxy_pass http://egret_base;
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
 
-
         proxy_set_header Host $http_host;
         proxy_set_header x-forwarded-host $http_host;
         proxy_set_header x-real-ip $remote_addr;
@@ -475,4 +512,5 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }