From 88e0a64c4635ffc3b296bf9a2fe9d7983dc7e889 Mon Sep 17 00:00:00 2001
From: Tobias Wochinger <t.wochinger@rasa.com>
Date: Fri, 21 Feb 2020 16:50:21 +0100
Subject: [PATCH 1/4] add the database port env to rasa x and event service

---
 charts/rasa-x/templates/_postgresql.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/rasa-x/templates/_postgresql.tpl b/charts/rasa-x/templates/_postgresql.tpl
index c8d03d5c..459be4a7 100644
--- a/charts/rasa-x/templates/_postgresql.tpl
+++ b/charts/rasa-x/templates/_postgresql.tpl
@@ -68,6 +68,8 @@ Return the common database env variables.
   value: {{ template "rasa-x.psql.username" . }}
 - name: "DB_HOST"
   value: {{ template "rasa-x.psql.host" . }}
+- name: "DB_PORT"
+  value: {{ template "rasa-x.psql.port" . }}
 - name: "DB_DATABASE"
   value: "{{ template "rasa-x.psql.database" . }}"
 - name: "DB_PASSWORD"

From 92d3f3979d4629d4f2f68d48b45614d8d30f147a Mon Sep 17 00:00:00 2001
From: Tobias Wochinger <t.wochinger@rasa.com>
Date: Fri, 21 Feb 2020 16:58:59 +0100
Subject: [PATCH 2/4] use the common storageClass so that one setting applies
 to all claims

---
 charts/rasa-x/templates/_helpers.tpl | 6 +++---
 charts/rasa-x/values.yaml            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/rasa-x/templates/_helpers.tpl b/charts/rasa-x/templates/_helpers.tpl
index 90d79e82..47a9f7e7 100644
--- a/charts/rasa-x/templates/_helpers.tpl
+++ b/charts/rasa-x/templates/_helpers.tpl
@@ -136,11 +136,11 @@ Return the port of the action container.
 Return the storage class name which should be used.
 */}}
 {{- define "rasa-x.persistence.storageClass" -}}
-{{- if .Values.rasax.persistence.storageClassName }}
-  {{- if (eq "-" .Values.rasax.persistence.storageClassName) }}
+{{- if .Values.global.storageClass }}
+  {{- if (eq "-" .Values.global.storageClass) }}
   storageClassName: ""
   {{- else }}
-  storageClassName: "{{ .Values.rasax.persistence.storageClassName }}"
+  storageClassName: "{{ .Values.global.storageClass }}"
   {{- end -}}
 {{- end -}}
 {{- end }}
diff --git a/charts/rasa-x/values.yaml b/charts/rasa-x/values.yaml
index a4343b13..776e6511 100644
--- a/charts/rasa-x/values.yaml
+++ b/charts/rasa-x/values.yaml
@@ -30,8 +30,6 @@ rasax:
   ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
   ##
   persistence:
-    # storageClassName the volume claim should use
-    # storageClassName: "-"
     # access Modes of the pvc
     accessModes:
     - ReadWriteOnce
@@ -290,6 +288,8 @@ fullnameOverride: ""
 
 # global settings of the used subcharts
 global:
+  # storageClass the volume claims should use
+  # storageClass: "-"
   # postgresql: global settings of the postgresql subchart
   postgresql:
     # postgresqlUsername which should be used by Rasa to connect to Postgres

From 52c7bb0647908dc037f7e1b74449a7ad3618930f Mon Sep 17 00:00:00 2001
From: Tobias Wochinger <t.wochinger@rasa.com>
Date: Fri, 21 Feb 2020 17:01:47 +0100
Subject: [PATCH 3/4] bump minor since the storage class key moved

---
 charts/rasa-x/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/rasa-x/Chart.yaml b/charts/rasa-x/Chart.yaml
index 4ddb6057..e9079858 100644
--- a/charts/rasa-x/Chart.yaml
+++ b/charts/rasa-x/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 
-version: "1.0.7"
+version: "1.1.0"
 appVersion: "0.25.1"
 
 name: rasa-x

From b38f64e12b098c4510d339fe607cbac87d350a38 Mon Sep 17 00:00:00 2001
From: Tobias Wochinger <t.wochinger@rasa.com>
Date: Fri, 21 Feb 2020 17:14:07 +0100
Subject: [PATCH 4/4] quote the env variables

---
 charts/rasa-x/templates/_postgresql.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/rasa-x/templates/_postgresql.tpl b/charts/rasa-x/templates/_postgresql.tpl
index 459be4a7..cd67a146 100644
--- a/charts/rasa-x/templates/_postgresql.tpl
+++ b/charts/rasa-x/templates/_postgresql.tpl
@@ -65,11 +65,11 @@ Return the common database env variables.
 */}}
 {{- define "rasa-x.psql.envs" -}}
 - name: "DB_USER"
-  value: {{ template "rasa-x.psql.username" . }}
+  value: "{{ template "rasa-x.psql.username" . }}"
 - name: "DB_HOST"
-  value: {{ template "rasa-x.psql.host" . }}
+  value: "{{ template "rasa-x.psql.host" . }}"
 - name: "DB_PORT"
-  value: {{ template "rasa-x.psql.port" . }}
+  value: "{{ template "rasa-x.psql.port" . }}"
 - name: "DB_DATABASE"
   value: "{{ template "rasa-x.psql.database" . }}"
 - name: "DB_PASSWORD"