Merge pull request #664 from CodeNow/hotfix-ingress-eru

update template and delta configs

Author: tosih

ansible/k8/delta/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,27 +113,27 @@ 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;
         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;
       }
+
     }
   drake.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;
       '' 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,27 +184,27 @@ 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;
         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;
       }
+
     }
   optimus.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;
       '' 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,27 +255,27 @@ 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;
         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;
       }
+
     }
   apisock.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;
       '' 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,38 +326,56 @@ 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;
         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;
       }
+
     }
   eru.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;
       '' 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;
       server_name eru.runnable.io;
       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,14 +441,15 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+
     }
   egret.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;
       '' close;
     }
 
-    upstream egret {
+    upstream egret_base {
       server egret:5432 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,17 +500,17 @@ 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;
         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;
       }
+
     }

ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl

@@ -63,19 +63,19 @@ data:
       '' close;
     }
 
-    {% for upstream in service.upstreams %}
+{% for upstream in service.upstreams %}
     upstream {{ service.name }}_{{ upstream.name }} {
       server {{ service.name }}:{{ upstream.port }} max_fails=0 fail_timeout=1s;
     }
-    {% endfor %}
 
+{% endfor %}
     server {
       listen 80;
       client_max_body_size 5g;
       server_name {{ service.name }}.{{ domain }};
       access_log /var/log/nginx/{{ service.name }}.access.log;
 
-      {% for upstream in service.upstreams %}
+{% for upstream in service.upstreams %}
       location {{ upstream.route }} {
         proxy_pass http://{{ service.name }}_{{ upstream.name }};
         proxy_http_version 1.1;
@@ -89,7 +89,8 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
-      {% endfor %}
+
+{% endfor %}
     }
 
     server {
@@ -116,7 +117,7 @@ data:
       resolver kube-dns.kube-system.svc.cluster.local valid=5s;
       resolver_timeout 5s;
 
-      {% for upstream in service.upstreams %}
+{% for upstream in service.upstreams %}
       location {{ upstream.route }} {
         proxy_pass http://{{ service.name }}_{{ upstream.name }};
         proxy_http_version 1.1;
@@ -130,6 +131,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
-      {% endfor %}
+
+{% endfor %}
     }
 {% endfor %}