Skip to content

Commit 699d18b

Browse files
committed
Update values for tm api
1 parent b68f8ce commit 699d18b

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

osm-seed/templates/tasking-manager-api/tm-configMap.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ data:
99
POSTGRES_PASSWORD: {{ quote .Values.tmDb.env.POSTGRES_PASSWORD | default "" }}
1010
POSTGRES_USER: {{ quote .Values.tmDb.env.POSTGRES_USER | default "" }}
1111
POSTGRES_PORT: "5432"
12-
TM_DB: {{ quote (printf "postgresql://%s:%s@%s-tasking-manager-db/%s" .Values.tmDb.env.POSTGRES_USER .Values.tmDb.env.POSTGRES_PASSWORD .Release.Name .Values.tmDb.env.POSTGRES_DB) }}
12+
TM_DB: {{ quote (printf "postgresql+asyncpg://%s:%s@%s-tasking-manager-db/%s" .Values.tmDb.env.POSTGRES_USER .Values.tmDb.env.POSTGRES_PASSWORD .Release.Name .Values.tmDb.env.POSTGRES_DB) }}
1313
TM_ORG_NAME: {{ quote .Values.tmApi.env.TM_ORG_NAME | default "" }}
1414
TM_ORG_CODE: {{ quote .Values.tmApi.env.TM_ORG_CODE | default "" }}
1515
TM_ORG_URL: {{ quote .Values.tmApi.env.TM_ORG_URL | default "" }}
@@ -44,4 +44,6 @@ data:
4444
TM_REDIRECT_URI: {{ quote .Values.tmApi.env.TM_REDIRECT_URI | default "" }}
4545
TM_SCOPE: {{ quote .Values.tmApi.env.TM_SCOPE | default "" }}
4646
TM_APP_API_VERSION: {{ quote .Values.tmApi.env.TM_APP_API_VERSION | default "v2" }}
47+
OHSOME_STATS_TOKEN: {{ quote .Values.tmApi.env.OHSOME_STATS_TOKEN }}
48+
POSTGRES_TEST_DB: {{ quote .Values.tmApi.env.POSTGRES_TEST_DB }}
4749
{{- end }}

osm-seed/templates/tasking-manager-api/tm-deployment.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ spec:
2626
initContainers:
2727
- name: db-upgrade
2828
image: "{{ .Values.tmApi.image.name }}:{{ .Values.tmApi.image.tag }}"
29-
# command: ["flask", "db", "upgrade"]
30-
command: ["alembic", "upgrade", "head"]
31-
workingDir: /usr/src/app
29+
command:
30+
- alembic
31+
- -c
32+
- /usr/src/app/migrations/alembic.ini
33+
- upgrade
34+
- head
3235
envFrom:
3336
- configMapRef:
3437
name: {{ .Release.Name }}-tm-common-env

osm-seed/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,8 @@ tmApi:
726726
TM_DEFAULT_LOCALE: "en"
727727
TM_APP_API_URL: ""
728728
TM_APP_BASE_URL: ""
729+
OHSOME_STATS_TOKEN: "dummy-token-for-migrations"
730+
POSTGRES_TEST_DB: "postgresql://user:pass@db:5432/test_db"
729731
resources:
730732
enabled: false
731733
requests:

0 commit comments

Comments
 (0)