diff --git a/charts/directus/README.md b/charts/directus/README.md index 1bb4bd7..1eb0093 100644 --- a/charts/directus/README.md +++ b/charts/directus/README.md @@ -39,9 +39,9 @@ Directus is a real-time API and App dashboard for managing SQL database content. | autoscaling.minReplicas | int | `1` | | | autoscaling.targetCPUUtilizationPercentage | int | `80` | | | createApplicationSecret | bool | `true` | This setting enables the creation of `ADMIN_PASSWORD`, `KEY`, and `SECRET` variables in k8s secrets. If it is set to false, you MUST set these variables manually via existing secret resource and set its name below. | -| createMysqlSecret | bool | `true` | Create MySQL secret in Directus chart If set to enable, mysql secret with values of `mysql-root-password`, `mysql-replication-password` and `mysql-password` variables will be created. Please consult the official bitnami mysql values file - https://github.com/bitnami/charts/blob/main/bitnami/mysql/values.yaml#L152. If set to false, you MUST create a secret resource in k8s for mysql installation and set the correct value to the `existingSecret` in the mysql settings section. | -| createPostgresqlSecret | bool | `false` | Create PostgreSQL secret in Directus chart If set to enable, postgresql secret with values of `postgres-password`, `password`, and `replication-password` variables will be created. Please consult the official bitnami postgres values file - https://github.com/bitnami/charts/blob/main/bitnami/postgresql/values.yaml#L164. If set to false, you MUST create a secret resource in k8s for postgresql installation and set the correct value to the `existingSecret` in the postgresql settings setion. | -| databaseEngine | string | `"mysql"` | Database engine. Could be set to one value from the following list: `mysql`, `postgresql`. Please disable installations for other database engines in this chart. Please note if you use mariadb server, set `databaseEngine` to `mysql` value. Details are here - https://directus.io/docs/configuration/database. | +| createMysqlSecret | bool | `true` | Create MySQL secret in Directus chart If set to enable, mysql secret with values of `mysql-root-password`, `mysql-replication-password` and `mysql-password` variables will be created. Please consult the official bitnami mysql values file - . If set to false, you MUST create a secret resource in k8s for mysql installation and set the correct value to the `existingSecret` in the mysql settings section. | +| createPostgresqlSecret | bool | `false` | Create PostgreSQL secret in Directus chart If set to enable, postgresql secret with values of `postgres-password`, `password`, and `replication-password` variables will be created. Please consult the official bitnami postgres values file - . If set to false, you MUST create a secret resource in k8s for postgresql installation and set the correct value to the `existingSecret` in the postgresql settings setion. | +| databaseEngine | string | `"mysql"` | Database engine. Could be set to one value from the following list: `mysql`, `postgresql`, `pg` or `postgres`. Please disable installations for other database engines in this chart. Please note if you use mariadb server, set `databaseEngine` to `mysql` value. Details are here - . | | extraEnvVars | list | `[]` | | | extraVolumeMounts | list | `[]` | | | extraVolumes | list | `[]` | | @@ -63,7 +63,7 @@ Directus is a real-time API and App dashboard for managing SQL database content. | mysql.auth.database | string | `"directus_mysql"` | | | mysql.auth.existingSecret | string | `"directus-mysql-secret"` | | | mysql.auth.username | string | `"directus_mysql"` | | -| mysql.enableInstallation | bool | `true` | The switch to switch off the installation of the mysql. The rest of the settings are being used during the installation and for DB connection. Link to the values.yaml file in bitnami repo - https://github.com/bitnami/charts/blob/main/bitnami/mysql/values.yaml | +| mysql.enableInstallation | bool | `true` | The switch to switch off the installation of the mysql. The rest of the settings are being used during the installation and for DB connection. Link to the values.yaml file in bitnami repo - | | mysql.global | object | `{"security":{"allowInsecureImages":true}}` | Global security settings for mysql image. Set to true to allow insecure images from bitnamilegacy repository | | mysql.image | object | `{"registry":"docker.io","repository":"bitnamilegacy/mysql","tag":"9.4.0-debian-12-r1"}` | MySQL image settings | | mysql.mysqlPort | string | `""` | | @@ -75,7 +75,7 @@ Directus is a real-time API and App dashboard for managing SQL database content. | postgresql.auth.database | string | `"directus_postgres"` | | | postgresql.auth.existingSecret | string | `"directus-postgresql-secret"` | | | postgresql.auth.username | string | `"directus_postgres"` | | -| postgresql.enableInstallation | bool | `false` | The switch to switch off the installation of the postgresql. The rest of the settings are being used during the installation and for DB connection. Link to the values.yaml file in bitnami repo - https://github.com/bitnami/charts/blob/main/bitnami/postgresql/values.yaml | +| postgresql.enableInstallation | bool | `false` | The switch to switch off the installation of the postgresql. The rest of the settings are being used during the installation and for DB connection. Link to the values.yaml file in bitnami repo - | | postgresql.global | object | `{"security":{"allowInsecureImages":true}}` | Global security settings for postgresql image. Set to true to allow insecure images from bitnamilegacy repository | | postgresql.image | object | `{"registry":"docker.io","repository":"bitnamilegacy/postgresql","tag":"17.6.0-debian-12-r4"}` | PostgreSQL image settings | | postgresql.postgresqlPort | string | `""` | | @@ -110,4 +110,3 @@ Directus is a real-time API and App dashboard for managing SQL database content. | startupProbe.httpGet.port | string | `"http"` | | | tolerations | list | `[]` | | | updateStrategy | object | `{"type":"RollingUpdate"}` | Or: updateStrategy: type: Recreate | - diff --git a/charts/directus/templates/configmap.yaml b/charts/directus/templates/configmap.yaml index e31c7ea..fd7ce61 100644 --- a/charts/directus/templates/configmap.yaml +++ b/charts/directus/templates/configmap.yaml @@ -8,11 +8,11 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "directus.chart" . }} data: - DB_CLIENT: {{ .Values.databaseEngine }} - DB_HOST: {{- if eq .Values.databaseEngine "mysql" }} {{- if .Values.mysql.mysqlURL }} "{{ .Values.mysql.mysqlURL }}" {{- else }} "{{ .Release.Name }}-mysql.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} {{- else if eq .Values.databaseEngine "postgresql" }} {{- if .Values.postgresql.postgresqlURL }} "{{ .Values.postgresql.postgresqlURL }}" {{- else }} "{{ .Release.Name }}-postgresql.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} {{- end }} - DB_PORT: {{ if eq .Values.databaseEngine "mysql" }}{{ default "3306" .Values.mysql.mysqlPort | quote }}{{ else if eq .Values.databaseEngine "postgresql" }}{{ default "5432" .Values.postgresql.postgresqlPort | quote }}{{ end }} - DB_DATABASE: {{- if eq .Values.databaseEngine "mysql" }} {{ .Values.mysql.auth.database }} {{- else if eq .Values.databaseEngine "postgresql" }} {{ .Values.postgresql.auth.database }} {{- else }} "" {{- end }} - DB_USER: {{- if eq .Values.databaseEngine "mysql" }} {{ .Values.mysql.auth.username }} {{- else if eq .Values.databaseEngine "postgresql" }} {{ .Values.postgresql.auth.username }} {{- else }} "" {{- end }} + DB_CLIENT: {{- if or (eq .Values.databaseEngine "postgresql") (eq .Values.databaseEngine "pg") (eq .Values.databaseEngine "postgres") }} pg {{- else }} {{ .Values.databaseEngine }} {{- end }} + DB_HOST: {{- if eq .Values.databaseEngine "mysql" }} {{- if .Values.mysql.mysqlURL }} "{{ .Values.mysql.mysqlURL }}" {{- else }} "{{ .Release.Name }}-mysql.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} {{- else if or (eq .Values.databaseEngine "postgresql") (eq .Values.databaseEngine "pg") (eq .Values.databaseEngine "postgres") }} {{- if .Values.postgresql.postgresqlURL }} "{{ .Values.postgresql.postgresqlURL }}" {{- else }} "{{ .Release.Name }}-postgresql.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} {{- end }} + DB_PORT: {{ if eq .Values.databaseEngine "mysql" }}{{ default "3306" .Values.mysql.mysqlPort | quote }}{{ else if or (eq .Values.databaseEngine "postgresql") (eq .Values.databaseEngine "pg") (eq .Values.databaseEngine "postgres") }}{{ default "5432" .Values.postgresql.postgresqlPort | quote }}{{ end }} + DB_DATABASE: {{- if eq .Values.databaseEngine "mysql" }} {{ .Values.mysql.auth.database }} {{- else if or (eq .Values.databaseEngine "postgresql") (eq .Values.databaseEngine "pg") (eq .Values.databaseEngine "postgres") }} {{ .Values.postgresql.auth.database }} {{- else }} "" {{- end }} + DB_USER: {{- if eq .Values.databaseEngine "mysql" }} {{ .Values.mysql.auth.username }} {{- else if or (eq .Values.databaseEngine "postgresql") (eq .Values.databaseEngine "pg") (eq .Values.databaseEngine "postgres") }} {{ .Values.postgresql.auth.username }} {{- else }} "" {{- end }} ADMIN_EMAIL: "{{ .Values.adminEmail }}" REDIS_ENABLED: {{- if .Values.redis.enabled }} "true" {{- else }} "false" {{- end }} {{- if .Values.redis.enabled}}