fix helm2 compatibility

Author: a60814billy

charts/codimd/README.md

@@ -19,18 +19,13 @@ $ helm install my-release codimd/codimd
 
 ## Parameters
 
-### Global parameters
+### Common Helm parameters
 
 If you use AWS EKS, please setup global.storageClass as `gp2`
 
-| Parameter           | Description                              | Default |
-| ------------------- |:---------------------------------------- | ------- |
-| global.storageClass | default storageClass for PersistenVolume | `nil`   |
-
-### Common Helm parameters
-
 | Parameter        | Description                                                                                         | Default |
 | ---------------- |:--------------------------------------------------------------------------------------------------- | ------- |
+| storageClass     | default storageClass for PersistenVolume                                                            | `nil`   |
 | nameOverride     | String to partially override codimd.fullname template with a string (will prepend the release name) | `nil`   |
 | fullnameOverride | String to fully override codimd.fullname template with a string                                     | `nil`   |
 

charts/codimd/templates/db-secret.yaml

@@ -7,6 +7,8 @@ stringData:
   connection: "postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{ template "codimd.postgresql-svc" . }}/{{ .Values.postgresql.postgresqlDatabase }}"
   {{ else if .Values.mariadb.enabled }}
   connection: "mysql://{{ .Values.mariadb.db.user }}:{{ .Values.mariadb.db.password }}@{{ template "codimd.mariadb-svc" . }}/{{ .Values.mariadb.db.name }}"
-  {{ else }}
+  {{ else if .Values.codimd.database }}
   connection: "{{ .Values.codimd.database.type }}://{{ .Values.codimd.database.username }}:{{ .Values.codimd.database.password }}@{{ .Values.codimd.database.host }}:{{ .Values.codimd.database.port }}/{{ .Values.codimd.database.databaseName }}"
+  {{ else }}
+  connection: "postgres://localhost/codimd"
   {{ end }}

charts/codimd/values.yaml

@@ -2,9 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-global:
-  # storageClass:
-
+# storageClass:
 # nameOverride:
 # fullnameOverride:
 
@@ -24,7 +22,7 @@ image:
 ## If you want to use external database, just set postgresql.enabled to false
 ##
 postgresql:
-  enabled: true
+  install: true
   volumePermissions:
     enabled: true
   postgresqlUsername: codimd
@@ -38,7 +36,7 @@ postgresql:
 ## If you prefer MariaDB, we also supported.
 ##
 mariadb:
-  enabled: false
+  install: false
   volumePermissions:
     enabled: true
   db: