diff --git a/ops/deployments/nomad.import.yaml b/ops/deployments/nomad.import.yaml index dd11c047a24d3f67804116185d4b2bc1d74e1b24..6ca2416ac22da3e989bc90b1172eca9ce54ae5a6 100644 --- a/ops/deployments/nomad.import.yaml +++ b/ops/deployments/nomad.import.yaml @@ -1,3 +1,9 @@ +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 diff --git a/ops/deployments/nomad.prod-1.values.yaml b/ops/deployments/nomad.prod-1.values.yaml index e4b652d26c108763a27cfd3d82e18552dd98a9d6..9a65632fbc0c585c14d930facd67fab8a4614fb2 100644 --- a/ops/deployments/nomad.prod-1.values.yaml +++ b/ops/deployments/nomad.prod-1.values.yaml @@ -1,17 +1,24 @@ 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 diff --git a/ops/deployments/nomad.prod-test.values.yaml b/ops/deployments/nomad.prod-test.values.yaml index 85331d16ef24598a25252742f2210b1800f1f5b4..08ab056cb035e21a30c77983c7c9033aff346ca4 100644 --- a/ops/deployments/nomad.prod-test.values.yaml +++ b/ops/deployments/nomad.prod-test.values.yaml @@ -1,8 +1,6 @@ -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 diff --git a/ops/deployments/nomad.testing-major.values.yaml b/ops/deployments/nomad.testing-major.values.yaml index 2f223fc3ebe98aa13420d063b1763e91d50e9a16..4b956801d5ea2ffd814e49be6f05b182e1a66e3c 100644 --- a/ops/deployments/nomad.testing-major.values.yaml +++ b/ops/deployments/nomad.testing-major.values.yaml @@ -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 diff --git a/ops/helm/nomad/templates/api-deployment.yaml b/ops/helm/nomad/templates/api-deployment.yaml index 83f53ed0a2f38f4382986af2c0a6652efa551939..af3555e3e60628dc3a7609a9e4d77eb96c977d57 100644 --- a/ops/helm/nomad/templates/api-deployment.yaml +++ b/ops/helm/nomad/templates/api-deployment.yaml @@ -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 }}