Merge pull request #25 from RasaHQ/multiple-fixes

Storage class, DB env

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

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 }}

charts/rasa-x/templates/_postgresql.tpl

@@ -65,9 +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" . }}"
 - name: "DB_DATABASE"
   value: "{{ template "rasa-x.psql.database" . }}"
 - name: "DB_PASSWORD"

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