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

Added keycloak config values to helm. [skip ci]

parent c158dc5d
......@@ -5,7 +5,7 @@ proxy:
path: "/fairdi/nomad/migration"
api:
adminPasswordSecrete: 'nomad-production-repository-password'
adminPasswordSecret: 'nomad-production-repository-password'
gui:
debug: true
......@@ -18,6 +18,10 @@ dbname: fairdi_nomad_migration
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/migration/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 2
public: /nomad/fairdi/migration/fs/public
......
......@@ -8,7 +8,7 @@ proxy:
path: "/uploads"
api:
adminPasswordSecrete: 'nomad-production-repository-password'
adminPasswordSecret: 'nomad-production-repository-password'
worker:
replicas: 1
......@@ -19,6 +19,10 @@ dbname: fairdi_nomad_prod
uploadurl: 'https://repository.nomad-coe.eu/uploads/gui/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 1
public: /nomad/fairdi/prod/fs/public
......
......@@ -8,7 +8,7 @@ proxy:
path: "/uploads"
api:
adminPasswordSecrete: 'nomad-production-repository-password'
adminPasswordSecret: 'nomad-production-repository-password'
worker:
replicas: 1
......@@ -19,6 +19,10 @@ dbname: fairdi_nomad_prod
uploadurl: 'https://repository.nomad-coe.eu/uploads/gui/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 1
public: /nomad/fairdi/prod/fs/public
......
......@@ -5,7 +5,7 @@ proxy:
path: "/fairdi/nomad/prod-test"
api:
adminPasswordSecrete: 'nomad-production-repository-password'
adminPasswordSecret: 'nomad-production-repository-password'
gui:
debug: true
......@@ -18,6 +18,10 @@ dbname: fairdi_nomad_prod
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/prod-test/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 1
public: /nomad/fairdi/prod/fs/public
......
......@@ -15,6 +15,10 @@ dbname: fairdi_nomad_prod
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/reprocess/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 1
public: /nomad/fairdi/prod/fs/public
......
......@@ -19,6 +19,10 @@ dbname: fairdi_nomad_staging
uploadurl: 'https://staging-nomad.rzg.mpg.de/uploads/gui/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 2
public: /nomad/fairdi/staging/fs/public
......
......@@ -15,6 +15,10 @@ dbname: fairdi_nomad_testing
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/testing/upload'
keycloak:
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
volumes:
prefixSize: 2
public: /nomad/fairdi/testing/fs/public
......
......@@ -119,6 +119,13 @@ spec:
name: {{ .Values.api.adminPasswordSecret }}
key: password
{{ end }}
{{ if .Values.keycloak.passwordSecret }}
- name: NOMAD_KEYCLOAK_PASSWORD
valueFrom
secretKeyRef:
name: {{ .Values.keycloak.passwordSecret }}
key: password
{{ end }}
command: ["python", "-m", "gunicorn.app.wsgiapp", "--timeout", "3600", "--config", "gunicorn.conf", "--log-config", "gunicorn.log.conf", "-w", "{{ .Values.api.worker }}", "-b 0.0.0.0:8000", "nomad.api:app"]
livenessProbe:
httpGet:
......
......@@ -31,6 +31,7 @@ data:
window.nomadEnv = {
"apiBase": "{{ .Values.proxy.external.path }}/api",
"kibanaBase": "{{ .Values.proxy.external.kibanaPath }}",
"keycloakBase": "{{ .Values.keycloak.serverUrl }}/realms/{{ .Values.keycloak.realmName }}",
"matomoSiteId": {{ .Values.gui.matomoSiteId }},
"matomoUrl": "{{ .Values.gui.matomoUrl }}",
"sendTrackingData": {{ .Values.gui.sendTrackingData }},
......
......@@ -53,4 +53,10 @@ data:
celery:
routing: "{{ .Values.worker.routing }}"
timeout: 7200
keycloak:
server_url: "{{ .Values.keycloak.serverUrl }}"
realm_name: "{{ .Values.keycloak.realmName }}"
username: "{{ .Values.keycloak.username }}"
client_id: "{{ .Values.keycloak.clientId }}"
client_secret: "*"
password: "*"
......@@ -63,6 +63,13 @@ spec:
name: {{ .Values.api.adminPasswordSecret }}
key: password
{{ end }}
{{ if .Values.keycloak.passwordSecret }}
- name: NOMAD_KEYCLOAK_PASSWORD
valueFrom
secretKeyRef:
name: {{ .Values.keycloak.passwordSecret }}
key: password
{{ end }}
command: ["python", "-m", "celery", "worker", "-A", "nomad.processing", "-n", "$(NOMAD_CELERY_NODE_NAME)" {{ if .Values.worker.processes }}, "-c", "{{ .Values.worker.processes }}"{{ end }}]
livenessProbe:
exec:
......
......@@ -126,6 +126,12 @@ mail:
port: 25
from: 'webmaster@nomad-repository.eu'
keycloak:
serverUrl: "https://labdev-nomad.esc.rzg.mpg.de/fairdi/keycloak/auth/"
realmName: "fairdi_nomad_test"
username: "admin"
clientId: "nomad_api_dev"
## Everything concerning the data that is used by the service
volumes:
prefixSize: 2
......
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