Merge branch 'master' into 5-2-update-dock-init-and-charon

Author: podviaznikov

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/k8/delta/api-socket-server/deployments/api-socket-server

@@ -13,7 +13,7 @@ spec:
         - name: runnable-kubernetes-pull-secret
       hostname: api-socket-server
       containers:
-        - image: quay.io/runnable/api:v11.39.2
+        - image: quay.io/runnable/api:v11.41.2
           imagePullPolicy: Always
           name: api-socket-server
           resources:

ansible/k8/delta/api-worker/deployments/api-worker

@@ -13,7 +13,7 @@ spec:
         - name: runnable-kubernetes-pull-secret
       hostname: api-worker
       containers:
-        - image: quay.io/runnable/api:v11.39.2
+        - image: quay.io/runnable/api:v11.41.2
           imagePullPolicy: Always
           name: api-worker
           resources:

ansible/k8/delta/api/deployments/api

@@ -13,7 +13,7 @@ spec:
         - name: runnable-kubernetes-pull-secret
       hostname: api
       containers:
-        - image: quay.io/runnable/api:v11.39.2
+        - image: quay.io/runnable/api:v11.41.2
           imagePullPolicy: Always
           name: api
           resources: