Skip to content
Snippets Groups Projects
Commit 8bf92eb9 authored by Chris Schaller's avatar Chris Schaller
Browse files

Merge branch '24-move-database-values-to-secret' into 'master'

Resolve "Move Database values to Secret"

Closes #24

See merge request dunkelzifferradar/modelling/dzr_model_orchestration!24
parents 3938e8b2 6dfc5d07
No related branches found
No related tags found
No related merge requests found
......@@ -7,9 +7,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.0
version: 0.4.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.0.2
appVersion: 1.0.0
......@@ -15,5 +15,5 @@ spec:
args:
- /bin/sh
- -c
- curl -X POST "http://{{ include "helm.fullname" . }}:{{ .Values.service.port }}{{ .Values.cronjob.endpoint }}"
- curl -X PUT "http://{{ include "helm.fullname" . }}:{{ .Values.service.port }}{{ .Values.cronjob.endpoint }}"
restartPolicy: OnFailure
......@@ -28,7 +28,10 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: DB_NAME
value: {{ .Values.database.name }}
valueFrom:
secretKeyRef:
name: {{ .Values.database.credentialsName }}
key: db_name
- name: DB_USER
valueFrom:
secretKeyRef:
......@@ -40,9 +43,19 @@ spec:
name: {{ .Values.database.credentialsName }}
key: db_password
- name: DB_HOST
value: {{ .Values.database.host }}
valueFrom:
secretKeyRef:
name: {{ .Values.database.credentialsName }}
key: db_host
- name: DB_PORT
value: "{{ .Values.database.port }}"
valueFrom:
secretKeyRef:
name: {{ .Values.database.credentialsName }}
key: db_port
- name: ICR_SERVICE_ENDPOINT
value: {{ .Values.endpoints.icr }}
- name: SIRU_SERVICE_ENDPOINT
value : {{ .Values.endpoints.siru }}
ports:
- name: http
containerPort: {{ .Values.service.port }}
......
......@@ -14,11 +14,12 @@ nameOverride: ""
fullnameOverride: ""
database:
name: postgres
host: dzr-db.ce9k0khfihtw.eu-central-1.rds.amazonaws.com
port: 5432
credentialsName: database-credentials-read-write
endpoints:
icr: http://model-icr-dzr-model-icr:8080/api/model/icr/evaluate
siru: http://model-sir-dzr-model-sir:8080/api/model/siru/evaluate
service:
name: http
type: ClusterIP
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment