Skip to content

Update gamma ingres proxy k8 configs. #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tosih merged 1 commit into from
May 17, 2017
Merged

Update gamma ingres proxy k8 configs. #665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 61 additions & 23 deletions ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data:
'' close;
}

upstream api {
upstream api_base {
server api:80 max_fails=0 fail_timeout=1s;
}

Expand All @@ -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;
Expand All @@ -85,6 +85,7 @@ data:
proxy_set_header x-forwarded-protocol $scheme;
proxy_set_header x-forwarded-proto $scheme;
}

}

server {
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
Expand All @@ -155,6 +156,7 @@ data:
proxy_set_header x-forwarded-protocol $scheme;
proxy_set_header x-forwarded-proto $scheme;
}

}

server {
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
Expand All @@ -225,6 +227,7 @@ data:
proxy_set_header x-forwarded-protocol $scheme;
proxy_set_header x-forwarded-proto $scheme;
}

}

server {
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
Expand All @@ -295,6 +298,7 @@ data:
proxy_set_header x-forwarded-protocol $scheme;
proxy_set_header x-forwarded-proto $scheme;
}

}

server {
Expand Down Expand Up @@ -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-gamma.com;
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;
Expand All @@ -365,6 +387,7 @@ data:
proxy_set_header x-forwarded-protocol $scheme;
proxy_set_header x-forwarded-proto $scheme;
}

}

server {
Expand Down Expand Up @@ -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;
Expand All @@ -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:65520 max_fails=0 fail_timeout=1s;
}

Expand All @@ -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;
Expand All @@ -435,6 +472,7 @@ data:
proxy_set_header x-forwarded-protocol $scheme;
proxy_set_header x-forwarded-proto $scheme;
}

}

server {
Expand Down Expand Up @@ -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;
}

}