From 14cee3d847c5b5b63dc4e3b8262609d8c9e5c080 Mon Sep 17 00:00:00 2001
From: ningjunwei2 <88232846+ningjunwei2@users.noreply.github.com>
Date: Fri, 4 Mar 2022 19:31:32 +0800
Subject: [PATCH] Fixed helm not using the configured pg port when installing
 cvat (#4415)

---
 cvat/settings/production.py                      | 1 +
 helm-chart/templates/cvat_backend/deployment.yml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/cvat/settings/production.py b/cvat/settings/production.py
index b12b9f16..ea34ae38 100644
--- a/cvat/settings/production.py
+++ b/cvat/settings/production.py
@@ -29,5 +29,6 @@ DATABASES = {
         'NAME': os.getenv('CVAT_POSTGRES_DBNAME', 'cvat'),
         'USER': os.getenv('CVAT_POSTGRES_USER', 'root'),
         'PASSWORD': os.getenv('CVAT_POSTGRES_PASSWORD', ''),
+        'PORT': os.getenv('CVAT_POSTGRES_PORT', 5432),
     }
 }
diff --git a/helm-chart/templates/cvat_backend/deployment.yml b/helm-chart/templates/cvat_backend/deployment.yml
index 86cd22d2..63970493 100644
--- a/helm-chart/templates/cvat_backend/deployment.yml
+++ b/helm-chart/templates/cvat_backend/deployment.yml
@@ -93,6 +93,8 @@ spec:
             value: "{{ .Values.postgresql.external.dbname }}"
           - name: CVAT_POSTGRES_PASSWORD
             value: "{{ .Values.postgresql.external.password }}"
+          - name: CVAT_POSTGRES_PORT
+            value: "{{ .Values.postgresql.external.port }}"            
           {{- end }}
           {{- with .Values.cvat.backend.additionalEnv }}
           {{- toYaml . | nindent 10 }}