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

Fixes to helm values and chart. [skip-ci]

parent 921d9a06
......@@ -19,6 +19,7 @@ dbname: fairdi_nomad_prod
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/prod-test/upload'
keycloak:
realmName: 'fairdi_nomad_prod'
passwordSecret: 'nomad-keycloak-password'
clientSecret: 'nomad-keycloak-prod-api-secret'
......
dependencies:
- name: rabbitmq
repository: https://kubernetes-charts.storage.googleapis.com/
version: 4.0.1
digest: sha256:91440e2bb5d4645a88c222836626306ef3d4e0c1e18a46c1442a2b3081655631
generated: 2018-12-13T14:16:27.606343+01:00
version: 5.1.0
digest: sha256:c93d68af945507f31e38cb7badd0781893e5541a93f95855157d7016dbf5ef6f
generated: 2019-08-28T16:37:38.419893741+02:00
......@@ -114,14 +114,14 @@ spec:
value: "{{ .Values.api.logstash_loglevel }}"
{{ if .Values.api.adminPasswordSecret }}
- name: NOMAD_SERVICES_ADMIN_PASSWORD
valueFrom
valueFrom:
secretKeyRef:
name: {{ .Values.api.adminPasswordSecret }}
key: password
{{ end }}
{{ if .Values.keycloak.passwordSecret }}
- name: NOMAD_KEYCLOAK_PASSWORD
valueFrom
valueFrom:
secretKeyRef:
name: {{ .Values.keycloak.passwordSecret }}
key: password
......
......@@ -31,7 +31,9 @@ data:
window.nomadEnv = {
"apiBase": "{{ .Values.proxy.external.path }}/api",
"kibanaBase": "{{ .Values.proxy.external.kibanaPath }}",
"keycloakBase": "{{ .Values.keycloak.serverUrl }}/realms/{{ .Values.keycloak.realmName }}",
"keycloakBase": "{{ .Values.keycloak.serverUrl }}",
"keycloakRealm": "{{ .Values.keycloak.realmName }}",
"keycloakClientId": "{{ .Values.keycloak.guiClientId }}",
"matomoSiteId": {{ .Values.gui.matomoSiteId }},
"matomoUrl": "{{ .Values.gui.matomoUrl }}",
"sendTrackingData": {{ .Values.gui.sendTrackingData }},
......
......@@ -58,14 +58,14 @@ spec:
fieldPath: spec.nodeName
{{ if .Values.api.adminPasswordSecret }}
- name: NOMAD_SERVICES_ADMIN_PASSWORD
valueFrom
valueFrom:
secretKeyRef:
name: {{ .Values.api.adminPasswordSecret }}
key: password
{{ end }}
{{ if .Values.keycloak.passwordSecret }}
- name: NOMAD_KEYCLOAK_PASSWORD
valueFrom
valueFrom:
secretKeyRef:
name: {{ .Values.keycloak.passwordSecret }}
key: password
......
......@@ -131,6 +131,7 @@ keycloak:
realmName: "fairdi_nomad_test"
username: "admin"
clientId: "nomad_api_dev"
guiClientId: "nomad_gui_dev"
## Everything concerning the data that is used by the service
volumes:
......
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