diff --git a/charts/backend/Chart.lock b/charts/backend/Chart.lock index db3b74ede..55b57a388 100644 --- a/charts/backend/Chart.lock +++ b/charts/backend/Chart.lock @@ -2,5 +2,5 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami/ version: 10.13.8 -digest: sha256:fdac167862faff748ce16ae4203c9b3e7b45e2d13554c38435846ab884675a7c -generated: "2021-11-16T01:33:48.601845+02:00" +digest: sha256:fa60fe330271c390ce3a85e83c287366d16da2a4fad2b551403863d1ad9401a2 +generated: "2021-11-30T17:27:43.075244+03:00" diff --git a/charts/backend/Chart.yaml b/charts/backend/Chart.yaml index 394400caf..37ac6ae32 100644 --- a/charts/backend/Chart.yaml +++ b/charts/backend/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: backend -version: 2.0.4 +version: 2.0.5 appVersion: v2.0.0 -kubeVersion: "^1.14.0-0" +kubeVersion: "^1.18.0-0" description: The StakeWise backend application. type: application keywords: @@ -16,6 +16,7 @@ dependencies: - name: postgresql version: 10.13.8 repository: https://charts.bitnami.com/bitnami/ + condition: postgresql.enabled maintainers: - name: Dmitri Tsumak email: dmitri@stakewise.io diff --git a/charts/backend/templates/common-secret.yaml b/charts/backend/templates/common-secret.yaml index ddee3668e..5835e10c5 100644 --- a/charts/backend/templates/common-secret.yaml +++ b/charts/backend/templates/common-secret.yaml @@ -8,10 +8,8 @@ metadata: type: Opaque data: SECRET_KEY: {{ .Values.commonConf.secretKey | b64enc | quote }} - {{- $relname := .Release.Name -}} - {{- $relnamespace := .Release.Namespace -}} {{- with .Values.postgresql }} - DATABASE_URL: {{ printf "postgres://%s:%s@%s-postgresql.%s.svc.cluster.local:%g/%s" .postgresqlUsername .postgresqlPassword $relname $relnamespace .service.port .postgresqlDatabase | b64enc | quote }} + DATABASE_URL: {{ printf "postgres://%s:%s@%s:%g/%s" .postgresqlUsername .postgresqlPassword .postgresqlHost .postgresqlPort .postgresqlDatabase | b64enc | quote }} {{- end }} NOTIFIERS_TELEGRAM_TOKEN: {{ .Values.commonConf.telegramToken | b64enc | quote }} NOTIFIERS_TELEGRAM_CHAT_ID: {{ .Values.commonConf.telegramChatId | b64enc | quote }} diff --git a/charts/backend/values.yaml b/charts/backend/values.yaml index 05655e8df..1f29c2b17 100644 --- a/charts/backend/values.yaml +++ b/charts/backend/values.yaml @@ -311,6 +311,7 @@ polling: pollUniswapPeriod: "60" postgresql: + enabled: false volumePermissions: enabled: true image: @@ -331,6 +332,8 @@ postgresql: name: postgresql rbac: create: false + postgresqlHost: "postgres" + postgresqlPort: "5432" postgresqlUsername: "postgres" postgresqlPassword: "postgres" usePasswordFile: true