Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Commits
e8f260d7
Verified
Commit
e8f260d7
authored
4 months ago
by
Martin Weise
Browse files
Options
Downloads
Patches
Plain Diff
Added gateway config
parent
2358741b
No related branches found
No related tags found
1 merge request
!370
Fixed the test
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
helm/dbrepo/files/dbrepo.conf
+171
-0
171 additions, 0 deletions
helm/dbrepo/files/dbrepo.conf
helm/dbrepo/templates/gateway-configmap.yaml
+10
-0
10 additions, 0 deletions
helm/dbrepo/templates/gateway-configmap.yaml
helm/dbrepo/values.yaml
+1
-169
1 addition, 169 deletions
helm/dbrepo/values.yaml
with
182 additions
and
169 deletions
helm/dbrepo/files/dbrepo.conf
0 → 100644
+
171
−
0
View file @
e8f260d7
# This is required to proxy Grafana Live WebSocket connections.
map
$
http_upgrade
$
connection_upgrade
{
default
upgrade
;
''
close
;
}
client_max_body_size
20
G
;
resolver
127
.
0
.
0
.
11
valid
=
30
s
;
# docker dns
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
;
}
}
This diff is collapsed.
Click to expand it.
helm/dbrepo/templates/gateway-configmap.yaml
0 → 100644
+
10
−
0
View file @
e8f260d7
{{
- if .Values.gatewayservice.enabled
}}
---
apiVersion
:
v1
kind
:
ConfigMap
metadata
:
name
:
gateway-service-setup
namespace
:
{{
include "common.names.namespace" . | quote
}}
data
:
{{
(.Files.Glob "files/dbrepo.conf").AsConfig | nindent 2
}}
{{
- end
}}
This diff is collapsed.
Click to expand it.
helm/dbrepo/values.yaml
+
1
−
169
View file @
e8f260d7
...
@@ -1011,175 +1011,7 @@ gatewayservice:
...
@@ -1011,175 +1011,7 @@ gatewayservice:
## @skip gatewayservice.fullnameOverride
## @skip gatewayservice.fullnameOverride
fullnameOverride
:
gateway-service
fullnameOverride
:
gateway-service
## @param gatewayservice.serverBlock The extra configuration for the reverse proxy
## @param gatewayservice.serverBlock The extra configuration for the reverse proxy
serverBlock
:
|
existingServerBlockConfigmap
:
gateway-service-setup
# This is required to proxy Grafana Live WebSocket connections.
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
upstream analyse {
server analyse-service;
}
upstream data {
server data-service;
}
upstream metadata {
server metadata-service;
}
upstream search {
server search-service;
}
upstream ui {
server ui;
}
upstream upload {
server upload-service;
}
upstream dashboard-service {
server dashboard-service:3000;
}
server {
listen 8080 default_server;
server_name _;
location /assets/ {
root /etc/nginx/assets;
expires max;
access_log off;
autoindex on;
autoindex_exact_size off;
autoindex_format html;
autoindex_localtime on;
}
location /dashboard/ {
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|statistic) {
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.
## @param gatewayservice.replicaCount The number of replicas.
replicaCount
:
3
replicaCount
:
3
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment