From 26a0aad2a3c19d523e7aea68be92c6213b094930 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Tue, 12 Oct 2021 19:17:17 +0530
Subject: [PATCH] fix(postgres): variable name

---
 scripts/helm/app/openreplay/templates/deployment.yaml     | 4 ++--
 scripts/helm/roles/openreplay/templates/chalice.yaml      | 6 +++---
 scripts/helm/roles/openreplay/templates/db.yaml           | 2 +-
 scripts/helm/roles/openreplay/templates/http.yaml         | 2 +-
 scripts/helm/roles/openreplay/templates/integrations.yaml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/helm/app/openreplay/templates/deployment.yaml b/scripts/helm/app/openreplay/templates/deployment.yaml
index 187025b74..da9963fe7 100644
--- a/scripts/helm/app/openreplay/templates/deployment.yaml
+++ b/scripts/helm/app/openreplay/templates/deployment.yaml
@@ -50,9 +50,9 @@ spec:
       {{- if eq .Values.pvc.name "hostPath" }}
           volumeMounts:
           - mountPath: {{ .Values.pvc.mountPath }}
-            name: {{ .Values.pvc.name }}
+            name: datadir
       volumes:
-      - name: mydir
+      - name: datadir
         hostPath:
           # Ensure the file directory is created.
           path: {{ .Values.pvc.hostMountPath }}
diff --git a/scripts/helm/roles/openreplay/templates/chalice.yaml b/scripts/helm/roles/openreplay/templates/chalice.yaml
index 46de7488b..8b0596f86 100644
--- a/scripts/helm/roles/openreplay/templates/chalice.yaml
+++ b/scripts/helm/roles/openreplay/templates/chalice.yaml
@@ -17,7 +17,7 @@ env:
   jwt_secret: "{{ jwt_secret_key }}"
   pg_host: "{{ postgres_endpoint }}"
   pg_port: "{{ postgres_port }}"
-  pg_dbname: "{{ postgres_port }}"
+  pg_dbname: "{{ postgres_db_name }}"
   pg_user: "{{ postgres_db_user }}"
   pg_password: "{{ postgres_db_password }}"
   EMAIL_HOST: "{{ email_host }}"
@@ -29,8 +29,8 @@ env:
   EMAIL_SSL_KEY: "{{ email_ssl_key }}"
   EMAIL_SSL_CERT: "{{ email_ssl_cert }}"
   EMAIL_FROM: "{{ email_from }}"
-  AWS_DEFAULT_REGION: "{{ aws_default_region }}"
-  sessions_region: "{{ aws_default_region }}"
+  AWS_DEFAULT_REGION: "{{ aws_region }}"
+  sessions_region: "{{ aws_region }}"
 {% if env is defined and env.chalice is defined and env.chalice%}
   {{ env.chalice | to_nice_yaml | trim | indent(2) }}
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/db.yaml b/scripts/helm/roles/openreplay/templates/db.yaml
index 7456794c8..699843036 100644
--- a/scripts/helm/roles/openreplay/templates/db.yaml
+++ b/scripts/helm/roles/openreplay/templates/db.yaml
@@ -5,7 +5,7 @@ image:
 {% endif %}
 env:
   LICENSE_KEY: "{{ enterprise_edition_license }}"
-  POSTGRES_STRING: "postgres://{{ postgres_db_user }}:{{ postgres_password }}@{{ postgres_endpoint }}:{{ postgres_port }}"
+  POSTGRES_STRING: "postgres://{{ postgres_db_user }}:{{ postgres_db_password }}@{{ postgres_endpoint }}:{{ postgres_port }}"
   REDIS_STRING: "{{ redis_endpoint }}"
   KAFKA_SERVERS: "{{ kafka_endpoint }}"
   KAFKA_USE_SSL: "{{ kafka_ssl }}"
diff --git a/scripts/helm/roles/openreplay/templates/http.yaml b/scripts/helm/roles/openreplay/templates/http.yaml
index da7b0979f..1ec67bc0a 100644
--- a/scripts/helm/roles/openreplay/templates/http.yaml
+++ b/scripts/helm/roles/openreplay/templates/http.yaml
@@ -8,7 +8,7 @@ env:
   AWS_SECRET_ACCESS_KEY: "{{ minio_secret_key }}"
   LICENSE_KEY: "{{ enterprise_edition_license }}"
   AWS_REGION: "{{ aws_region }}"
-  POSTGRES_STRING: "postgres://{{ postgres_db_user }}:{{ postgres_password }}@{{ postgres_endpoint }}:{{ postgres_port }}"
+  POSTGRES_STRING: "postgres://{{ postgres_db_user }}:{{ postgres_db_password }}@{{ postgres_endpoint }}:{{ postgres_port }}"
   REDIS_STRING: "{{ redis_endpoint }}"
   KAFKA_SERVERS: "{{ kafka_endpoint }}"
   KAFKA_USE_SSL: "{{ kafka_ssl }}"
diff --git a/scripts/helm/roles/openreplay/templates/integrations.yaml b/scripts/helm/roles/openreplay/templates/integrations.yaml
index 9cc8f8b76..953b9d87f 100644
--- a/scripts/helm/roles/openreplay/templates/integrations.yaml
+++ b/scripts/helm/roles/openreplay/templates/integrations.yaml
@@ -5,7 +5,7 @@ image:
 {% endif %}
 env:
   LICENSE_KEY: "{{ enterprise_edition_license }}"
-  POSTGRES_STRING: "postgres://{{ postgres_db_user }}:{{ postgres_password }}@{{ postgres_endpoint }}:{{ postgres_port }}"
+  POSTGRES_STRING: "postgres://{{ postgres_db_user }}:{{ postgres_db_password }}@{{ postgres_endpoint }}:{{ postgres_port }}"
   #
   REDIS_STRING: "{{ redis_endpoint }}"
   KAFKA_SERVERS: "{{ kafka_endpoint }}"