Commit 35130849 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Updated deplyoments.

parent 20507b72
Pipeline #68380 canceled with stages
in 50 seconds
images:
nomad:
tag: "v0.7.2"
frontend:
tag: "v0.7.2"
proxy:
nodePort: 30004
external:
......@@ -13,11 +19,16 @@ worker:
dbname: fairdi_nomad_import
postgres:
publish_enabled: false
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/import/upload'
keycloak:
serverUrl: "https://repository.nomad-coe.eu/fairdi/keycloak/auth/"
passwordSecret: 'nomad-keycloak-password'
realmName: 'fairdi_nomad_prod'
clientId: 'nomad_api_dev'
clientSecret: 'nomad-keycloak-prod-api-secret'
admin_user_id: '82efac55-6187-408c-8027-b98580c0e1c5'
volumes:
prefixSize: 1
public: /nomad/fairdi/import/fs/public
......
images:
nomad:
tag: "v0.6.3"
tag: "v0.7.3"
frontend:
tag: "v0.6.3"
services:
apiSecret: 'nomad-keycloak-prod-api-secret'
tag: "v0.7.3"
proxy:
nodePort: 30011
external:
host: "repository.nomad-coe.eu"
path: "/uploads"
path: "/app"
gui:
debug: false
app:
replicas: 2
worker: 12
threads: 4
workerClass: "gthread"
nomadNodeType: "public"
worker:
replicas: 1
......@@ -19,13 +26,20 @@ worker:
processes: 10
nomadNodeType: "prod-worker"
dbname: fairdi_nomad_prod
elastic:
port: 9202
uploadurl: 'https://repository.nomad-coe.eu/uploads/gui/upload'
dbname: fairdi_nomad_prod_v0_7
uploadurl: 'https://repository.nomad-coe.eu/app/gui/upload'
keycloak:
serverUrl: "https://repository.nomad-coe.eu/fairdi/keycloak/auth/"
passwordSecret: 'nomad-keycloak-password'
realmName: 'fairdi_nomad_prod'
clientId: 'nomad_api_dev'
clientSecret: 'nomad-keycloak-prod-api-secret'
admin_user_id: '82efac55-6187-408c-8027-b98580c0e1c5'
volumes:
prefixSize: 1
......@@ -39,3 +53,7 @@ mail:
host: 'mailrelay.mpcdf.mpg.de'
port: 25
from: 'webmaster@nomad-coe.eu'
datacite:
secret: 'nomad-datacite'
enabled: True
services:
apiSecret: 'nomad-keycloak-prod-api-secret'
proxy:
nodePort: 30014
timeout: 3600
external:
host: "labdev-nomad.esc.rzg.mpg.de"
path: "/fairdi/nomad/prod-test"
......@@ -14,14 +12,20 @@ worker:
replicas: 1
routing: "queue"
dbname: fairdi_nomad_prod
elastic:
port: 9202
dbname: fairdi_nomad_prod_v0_7
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/prod-test/upload'
keycloak:
realmName: 'fairdi_nomad_prod'
serverUrl: "https://repository.nomad-coe.eu/fairdi/keycloak/auth/"
passwordSecret: 'nomad-keycloak-password'
realmName: 'fairdi_nomad_prod'
clientId: 'nomad_api_dev'
clientSecret: 'nomad-keycloak-prod-api-secret'
admin_user_id: '82efac55-6187-408c-8027-b98580c0e1c5'
volumes:
prefixSize: 1
......
......@@ -11,20 +11,17 @@ worker:
replicas: 1
routing: "queue"
elastic:
port: 9202
dbname: fairdi_nomad_testing_major
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/testing-major/upload'
keycloak:
serverUrl: 'http://130.183.207.104:8002/fairdi/keycloak/auth/'
serverUrl: "https://repository.nomad-coe.eu/fairdi/keycloak/auth/"
passwordSecret: 'nomad-keycloak-password'
realmName: 'fairdi_nomad_test'
realmName: 'fairdi_nomad_prod'
clientId: 'nomad_api_dev'
clientSecret: 'nomad-keycloak-test-api-secret'
admin_user_id: 'c97facc2-92ec-4fa6-80cf-a08ed957255b'
clientSecret: 'nomad-keycloak-prod-api-secret'
admin_user_id: '82efac55-6187-408c-8027-b98580c0e1c5'
volumes:
prefixSize: 1
......
......@@ -65,8 +65,8 @@ data:
gunicorn.conf: |
secure_scheme_headers = {'X-FORWARDED-PROTOCOL': 'ssl', 'X-FORWARDED-PROTO': 'https', 'X-FORWARDED-SSL': 'on'}
{{ if ne .Values.app.workerClass "sync" }}
worker_class = '{{ .Values.app.workerClass }}'
threads = {{ .Values.app.threads }}
worker_class = '{{ .Values.app.workerClass }}'
threads = {{ .Values.app.threads }}
{{ end }}
worker_connections = 1000
workers = {{ .Values.app.worker }}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment