Skip to content
Snippets Groups Projects
Verified Commit c07a1152 authored by Martin Weise's avatar Martin Weise
Browse files

WIP

parent aa0388d3
Branches
Tags
1 merge request!370Fixed the test
Hide whitespace changes
Inline Side-by-side
dbrepo-gateway-service/dbrepo.conf
+ 0
− 4
View file @ c07a1152
......@@ -44,10 +44,6 @@ server {
listen 8080 default_server;
server_name _;
location = /basic_status {
stub_status;
}
location /dashboard/ {
rewrite ^/dashboard/(.*) /$1 break;
proxy_set_header Host $host;
......
helm/dbrepo/files/dbrepo.conf deleted 100644 → 0
+ 0
− 167
View file @ aa0388d3
# This is required to proxy Grafana Live WebSocket connections.
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
upstream broker {
server broker-service:15672;
}
upstream analyse {
server analyse-service:8080;
}
upstream data {
server data-service:8080;
}
upstream metadata {
server metadata-service:8080;
}
upstream search {
server search-service:8080;
}
upstream ui {
server ui:3000;
}
upstream upload {
server upload-service:8080;
}
upstream dashboard-service {
server dashboard-service:3000;
}
server {
listen 8080 default_server;
server_name _;
location = /basic_status {
stub_status;
}
location /dashboard/ {
rewrite ^/dashboard/(.*) /$1 break;
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://dashboard-service;
proxy_read_timeout 90;
}
# Proxy Grafana Live WebSocket connections.
location /dashboard/api/live/ {
proxy_set_header Host $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-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_http_version 1.1;
proxy_pass http://dashboard-service;
proxy_read_timeout 90;
}
location /api/search {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://search;
proxy_read_timeout 90;
}
location /api/upload {
# allow 128.130.0.0/16;
# deny all;
proxy_set_header Host $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-Proto $scheme;
proxy_set_header X-Forwarded-Host $host;
proxy_pass http://upload;
proxy_read_timeout 90;
# Disable request and response buffering
proxy_request_buffering off;
proxy_buffering off;
proxy_http_version 1.1;
}
location /api/analyse {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://analyse;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export) {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://data;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/view/([0-9]+)/(data|export) {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://data;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/view {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://metadata;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/subset {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://data;
proxy_read_timeout 600;
}
location ~ /api/(database|concept|container|identifier|image|message|license|oai|ontology|unit|user) {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://metadata;
proxy_read_timeout 90;
}
location ~ /pid/([0-9]+) {
rewrite /pid/(.*) /api/identifier/$1 break;
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://metadata;
proxy_read_timeout 90;
}
location / {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://ui;
proxy_read_timeout 90;
}
}
helm/dbrepo/templates/gateway-configmap.yaml deleted 100644 → 0
+ 0
− 10
View file @ aa0388d3
{{- if .Values.gatewayservice.enabled }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: gateway-service-config
namespace: {{ include "common.names.namespace" . | quote }}
data:
{{ (.Files.Glob "files/dbrepo.conf").AsConfig | nindent 2 }}
{{- end }}
helm/dbrepo/values.yaml
+ 163
− 7
View file @ c07a1152
......@@ -1013,13 +1013,169 @@ gatewayservice:
service:
## @param gatewayservice.service.type The service type.
type: ClusterIP
ports:
## @param gatewayservice.service.ports.http The port for HTTP traffic.
http: 8080
## @param gatewayservice.service.ports.https The port for HTTPS traffic.
https: 8443
## @param gatewayservice.existingServerBlockConfigmap The extra configuration for the reverse proxy
existingServerBlockConfigmap: gateway-service-config
## @param gatewayservice.serverBlock The extra configuration for the reverse proxy
serverBlock: |
# This is required to proxy Grafana Live WebSocket connections.
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
upstream broker {
server broker-service:15672;
}
upstream analyse {
server analyse-service:8080;
}
upstream data {
server data-service:8080;
}
upstream metadata {
server metadata-service:8080;
}
upstream search {
server search-service:8080;
}
upstream ui {
server ui:3000;
}
upstream upload {
server upload-service:8080;
}
upstream dashboard-service {
server dashboard-service:3000;
}
server {
listen 8080 default_server;
server_name _;
location /dashboard/ {
rewrite ^/dashboard/(.*) /$1 break;
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://dashboard-service;
proxy_read_timeout 90;
}
# Proxy Grafana Live WebSocket connections.
location /dashboard/api/live/ {
proxy_set_header Host $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-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_http_version 1.1;
proxy_pass http://dashboard-service;
proxy_read_timeout 90;
}
location /api/search {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://search;
proxy_read_timeout 90;
}
location /api/upload {
proxy_set_header Host $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-Proto $scheme;
proxy_set_header X-Forwarded-Host $host;
proxy_pass http://upload;
proxy_read_timeout 90;
# Disable request and response buffering
proxy_request_buffering off;
proxy_buffering off;
proxy_http_version 1.1;
}
location /api/analyse {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://analyse;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export) {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://data;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/view/([0-9]+)/(data|export) {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://data;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/view {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://metadata;
proxy_read_timeout 90;
}
location ~ /api/database/([0-9]+)/subset {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://data;
proxy_read_timeout 600;
}
location ~ /api/(database|concept|container|identifier|image|message|license|oai|ontology|unit|user) {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://metadata;
proxy_read_timeout 90;
}
location ~ /pid/([0-9]+) {
rewrite /pid/(.*) /api/identifier/$1 break;
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://metadata;
proxy_read_timeout 90;
}
location / {
proxy_set_header Host $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-Proto $scheme;
proxy_pass http://ui;
proxy_read_timeout 90;
}
}
## @param gatewayservice.replicaCount The number of replicas.
replicaCount: 3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment