Merge pull request #663 from CodeNow/change-ingress-ports

Add graphql port for Eru, add multiple upstreams for services

Author: tosih

ansible/group_vars/all.yml

@@ -131,6 +131,7 @@ aws_region: "us-west-2"
 
 # eru
 eru_http_port: 5501
+eru_graphql_port: 5502
 
 # fluffy
 fluffy_port: 80

ansible/group_vars/alpha-eru.yml

@@ -36,6 +36,10 @@ container_envs:
     value: "{{ big_poppa_host_address }}:{{ big_poppa_port }}"
   - name: CONSUL_HOST
     value: "{{ consul_host_address }}:{{ consul_api_port }}"
+  - name: DATADOG_HOST
+    valueFrom: "spec.nodeName"
+  - name: DATADOG_PORT
+    value: "{{ datadog_port }}"
   - name: DOMAIN
     value: "{{ eru_subdomain }}.{{ domain }}"
   - name: GITHUB_CLIENT_ID

ansible/group_vars/alpha-ingress-proxy.yml

@@ -24,14 +24,35 @@ volume_mounts:
 
 services:
   - name: api
-    port: "{{ api_port }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ api_port }}"
   - name: drake
-    port: "{{ drake_port }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ drake_port }}"
   - name: optimus
-    port: "{{ optimus_port }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ optimus_port }}"
   - name: apisock
-    port: "{{ api_port }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ api_port }}"
   - name: eru
-    port: "{{ eru_http_port }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ eru_http_port }}"
+      - name: graphql
+        route: "/graphql"
+        port: "{{ eru_graphql_port }}"
   - name: egret
-    port: "{{ egret_port }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ egret_port }}"

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

@@ -63,18 +63,21 @@ data:
       '' close;
     }
 
-    upstream {{ service.name }} {
-      server {{ service.name }}:{{ service.port }} max_fails=0 fail_timeout=1s;
+    {% for upstream in service.upstreams %}
+    upstream {{ service.name }}_{{ upstream.name }} {
+      server {{ service.name }}:{{ upstream.port }} max_fails=0 fail_timeout=1s;
     }
+    {% endfor %}
 
     server {
       listen 80;
       client_max_body_size 5g;
       server_name {{ service.name }}.{{ domain }};
       access_log /var/log/nginx/{{ service.name }}.access.log;
 
-      location / {
-        proxy_pass http://{{ service.name }};
+      {% for upstream in service.upstreams %}
+      location {{ upstream.route }} {
+        proxy_pass http://{{ service.name }}_{{ upstream.name }};
         proxy_http_version 1.1;
         proxy_set_header upgrade $http_upgrade;
         proxy_set_header connection $connection_upgrade;
@@ -86,6 +89,7 @@ data:
         proxy_set_header x-forwarded-protocol $scheme;
         proxy_set_header x-forwarded-proto $scheme;
       }
+      {% endfor %}
     }
 
     server {
@@ -112,19 +116,20 @@ data:
       resolver kube-dns.kube-system.svc.cluster.local valid=5s;
       resolver_timeout 5s;
 
-      location / {
-        proxy_pass http://{{ service.name }};
+      {% for upstream in service.upstreams %}
+      location {{ upstream.route }} {
+        proxy_pass http://{{ service.name }}_{{ upstream.name }};
         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;
       }
+      {% endfor %}
     }
 {% endfor %}