Merge pull request #3 from jianxiaoguo/dev

chore(chart): modify the off-cluster database

Author: duanhongyi

charts/database/templates/database-deployment.yaml

@@ -40,7 +40,7 @@ spec:
             - name: DATABASE_STORAGE
               value: "{{.Values.global.storage}}"
             - name: PGCTLTIMEOUT
-              value: "{{.Values.postgres.timeout}}"
+              value: "{{.Values.timeout}}"
           lifecycle:
             preStop:
               exec:

charts/database/templates/database-secret-creds.yaml

@@ -10,8 +10,4 @@ metadata:
 data: {{ if eq .Values.global.database_location "on-cluster"}}
   user: {{ if .Values.username | default "" | ne "" }}{{ .Values.username | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
   password: {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}{{ else if eq .Values.global.database_location "off-cluster"}}
-  user: {{ .Values.postgres.username | b64enc }}
-  password: {{ .Values.postgres.password | b64enc }}
-  name: {{ .Values.postgres.name | b64enc }}
-  host: {{ .Values.postgres.host | b64enc }}
-  port: {{ .Values.postgres.port | b64enc }}{{ end }}
+  url: {{ .Values.postgres.url | b64enc }}{{ end }}

charts/database/values.yaml

@@ -4,15 +4,11 @@ image_tag: "canary"
 image_registry: ""
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
+timeout: "1200"
 # The username and password to be used by the on-cluster database.
 # If left empty they will be generated using randAlphaNum
 username: ""
 password: ""
-
+# Configure the following ONLY if using an off-cluster database.
 postgres:
-  name: "database name"
-  username: "database username"
-  password: "database password"
-  host: "database host"
-  port: "database port"
-  timeout: "1200"
+  url: "postgres://USER:PASSWORD@HOST:PORT/NAME"