diff --git a/charts/memos/Chart.lock b/charts/memos/Chart.lock index 6ebdf3806..3f34bea4d 100644 --- a/charts/memos/Chart.lock +++ b/charts/memos/Chart.lock @@ -2,8 +2,11 @@ dependencies: - name: common repository: https://bjw-s.github.io/helm-charts version: 1.5.1 +- name: postgresql + repository: https://charts.bitnami.com/bitnami + version: 13.2.24 - name: mariadb repository: https://charts.bitnami.com/bitnami version: 14.1.2 -digest: sha256:d4491041a329f81f6fe04ce7d4fd19806e896c8f32f84b334fe1149000777ed4 -generated: "2023-11-20T01:51:25.609262-06:00" +digest: sha256:6c31c854f34450b8652df48e93461bc6b4f890aca0c9167366f4fc558ec8ed08 +generated: "2023-12-10T23:29:31.158809-06:00" diff --git a/charts/memos/Chart.yaml b/charts/memos/Chart.yaml index cdd86a27a..a9157244c 100644 --- a/charts/memos/Chart.yaml +++ b/charts/memos/Chart.yaml @@ -4,9 +4,9 @@ description: A lightweight, self-hosted memo hub. Open Source and Free forever. home: https://charts.gabe565.com/charts/memos/ icon: https://raw.githubusercontent.com/gabe565/charts/main/charts/memos/icon.png type: application -version: 0.9.2 +version: 0.10.0 # renovate datasource=docker depName=ghcr.io/usememos/memos -appVersion: 0.17.1 +appVersion: 0.18.0 kubeVersion: ">=1.22.0-0" keywords: - memo @@ -16,6 +16,10 @@ dependencies: - name: common repository: https://bjw-s.github.io/helm-charts version: 1.5.1 + - name: postgresql + version: 13.2.24 + repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled - name: mariadb version: 14.1.2 repository: https://charts.bitnami.com/bitnami @@ -24,8 +28,10 @@ sources: - https://github.com/usememos/memos annotations: artifacthub.io/changes: |- + - kind: changed + description: Update ghcr.io/usememos/memos docker tag to v0.18.0 - kind: added - description: Add mariadb subchart + description: Add Postgres subchart artifacthub.io/links: |- - name: App Source url: https://github.com/usememos/memos diff --git a/charts/memos/README.md b/charts/memos/README.md index 1eec8a802..017e64f7a 100644 --- a/charts/memos/README.md +++ b/charts/memos/README.md @@ -2,16 +2,16 @@ memos logo -![Version: 0.9.2](https://img.shields.io/badge/Version-0.9.2-informational?style=flat) +![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat) -![AppVersion: 0.17.1](https://img.shields.io/badge/AppVersion-0.17.1-informational?style=flat) +![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat) A lightweight, self-hosted memo hub. Open Source and Free forever. **Homepage:** **This chart is not maintained by the upstream project and any issues with the chart should be raised -[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=memos&version=0.9.2)** +[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=memos&version=0.10.0)** ## Source Code @@ -27,6 +27,7 @@ Kubernetes: `>=1.22.0-0` |------------|------|---------| | | common | 1.5.1 | | | mariadb | 14.1.2 | +| | postgresql | 13.2.24 | ## Installing the Chart @@ -87,13 +88,14 @@ N/A |-----|------|---------|-------------| | image.pullPolicy | string | `"IfNotPresent"` | image pull policy | | image.repository | string | `"ghcr.io/usememos/memos"` | image repository | -| image.tag | string | `"0.17.1"` | image tag | +| image.tag | string | `"0.18.0"` | image tag | | ingress.main | object | See [values.yaml](./values.yaml) | Enable and configure ingress settings for the chart under this key. | | mariadb | object | See [values.yaml](./values.yaml) | Enable and configure mariadb database subchart under this key. For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb) | | persistence | object | See [values.yaml](./values.yaml) | Configure persistence settings for the chart under this key. | | podSecurityContext.fsGroup | int | `65534` | Volume binds will be granted to `nobody` group | | podSecurityContext.runAsGroup | int | `65534` | Run as `nobody` group | | podSecurityContext.runAsUser | int | `65534` | Run as `nobody` user | +| postgresql | object | See [values.yaml](./values.yaml) | Enable and configure postgresql database subchart under this key. For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) | | service | object | See [values.yaml](./values.yaml) | Configures service settings for the chart. | --- diff --git a/charts/memos/templates/common.yaml b/charts/memos/templates/common.yaml index 26cd8df75..5645e0ed3 100644 --- a/charts/memos/templates/common.yaml +++ b/charts/memos/templates/common.yaml @@ -3,8 +3,17 @@ env: MEMOS_PORT: {{ .Values.service.main.ports.http.port }} - {{- with .Values.mariadb}} - {{- if .enabled }} + {{- if .Values.postgresql.enabled }} + {{- with .Values.postgresql }} + MEMOS_DRIVER: postgres + DB_PASSWORD: + secretKeyRef: + name: {{ $.Release.Name }}-postgresql + key: {{ if not .auth.password }}postgres-{{ end }}password + MEMOS_DSN: postgresql://{{ default "postgres" .auth.username }}:$(DB_PASSWORD)@{{ $.Release.Name }}-postgresql/{{ .auth.database }}?sslmode=disable + {{- end }} + {{- else if .Values.mariadb.enabled }} + {{- with .Values.mariadb }} MEMOS_DRIVER: mysql DB_PASSWORD: secretKeyRef: diff --git a/charts/memos/values.yaml b/charts/memos/values.yaml index 59c524b6f..933ba6f79 100644 --- a/charts/memos/values.yaml +++ b/charts/memos/values.yaml @@ -11,7 +11,7 @@ image: # -- image pull policy pullPolicy: IfNotPresent # -- image tag - tag: 0.17.1 + tag: 0.18.0 # -- Configures service settings for the chart. # @default -- See [values.yaml](./values.yaml) @@ -55,6 +55,20 @@ podSecurityContext: # -- Volume binds will be granted to `nobody` group fsGroup: 65534 +# -- Enable and configure postgresql database subchart under this key. +# For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) +# @default -- See [values.yaml](./values.yaml) +postgresql: + enabled: false + auth: + database: memos + postgresPassword: changeme + primary: + persistence: + enabled: false + # storageClass: "" + # size: 8Gi + # -- Enable and configure mariadb database subchart under this key. # For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb) # @default -- See [values.yaml](./values.yaml)