github-mirrorer/rtomik-helm-charts
1
0
Fork 1
mirror of https://github.com/rtomik/helm-charts.git synced 2026-04-05 09:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with joplin server helm chart with secret values

Browse Source
This commit is contained in:
Richard Tomik
2025-08-25 09:08:40 +02:00
parent e809d6067d
commit 85b6787314
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charts/joplin-server/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: joplin-server name: joplin-server
description: Joplin Server helm chart for Kubernetes - Note-taking and synchronization server description: Joplin Server helm chart for Kubernetes - Note-taking and synchronization server
type: application type: application
version: 0.0.1 version: 0.0.2
appVersion: "3.4.2" appVersion: "3.4.2"
maintainers: maintainers:
- name: Richard Tomik - name: Richard Tomik

21
charts/joplin-server/readme.md
View File

@ -104,9 +104,9 @@ $ helm uninstall joplin-server
| `postgresql.external.existingSecret` | Name of existing secret with PostgreSQL credentials | `""` | | `postgresql.external.existingSecret` | Name of existing secret with PostgreSQL credentials | `""` |
| `postgresql.external.userKey` | Key in the secret for username | `username` | | `postgresql.external.userKey` | Key in the secret for username | `username` |
| `postgresql.external.passwordKey` | Key in the secret for password | `password` | | `postgresql.external.passwordKey` | Key in the secret for password | `password` |
| `postgresql.external.hostKey` | Key in the secret for host | `host` | | `postgresql.external.hostKey` | Key in the secret for host (optional) | `""` |
| `postgresql.external.portKey` | Key in the secret for port | `port` | | `postgresql.external.portKey` | Key in the secret for port (optional) | `""` |
| `postgresql.external.databaseKey` | Key in the secret for database name | `database` | | `postgresql.external.databaseKey` | Key in the secret for database name (optional) | `""` |
### Joplin Server Configuration ### Joplin Server Configuration
@ -308,6 +308,7 @@ joplin:
### Using Kubernetes Secrets ### Using Kubernetes Secrets
#### Full Secret Configuration
```yaml ```yaml
postgresql: postgresql:
external: external:
@ -326,6 +327,20 @@ joplin:
passwordKey: "password" passwordKey: "password"
``` ```
#### Mixed Configuration (Host in values, credentials in secret)
```yaml
postgresql:
external:
enabled: true
host: "postgres-cluster-pooler.dbs.svc.cluster.local"
port: 5432
database: "joplin-server"
existingSecret: "joplin-db-credentials"
userKey: "username"
passwordKey: "password"
# hostKey, portKey, databaseKey left empty - using values above
```
### S3 Storage Configuration ### S3 Storage Configuration
```yaml ```yaml

10
charts/joplin-server/templates/deployment.yaml
View File

@ -77,7 +77,7 @@ spec:
{{- end }} {{- end }}
{{- if .Values.postgresql.external.enabled }} {{- if .Values.postgresql.external.enabled }}
- name: POSTGRES_HOST - name: POSTGRES_HOST
{{- if .Values.postgresql.external.existingSecret }} {{- if and .Values.postgresql.external.existingSecret .Values.postgresql.external.hostKey }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.postgresql.external.existingSecret }} name: {{ .Values.postgresql.external.existingSecret }}
@ -86,7 +86,7 @@ spec:
value: {{ .Values.postgresql.external.host | quote }} value: {{ .Values.postgresql.external.host | quote }}
{{- end }} {{- end }}
- name: POSTGRES_PORT - name: POSTGRES_PORT
{{- if .Values.postgresql.external.existingSecret }} {{- if and .Values.postgresql.external.existingSecret .Values.postgresql.external.portKey }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.postgresql.external.existingSecret }} name: {{ .Values.postgresql.external.existingSecret }}
@ -95,7 +95,7 @@ spec:
value: {{ .Values.postgresql.external.port | quote }} value: {{ .Values.postgresql.external.port | quote }}
{{- end }} {{- end }}
- name: POSTGRES_DATABASE - name: POSTGRES_DATABASE
{{- if .Values.postgresql.external.existingSecret }} {{- if and .Values.postgresql.external.existingSecret .Values.postgresql.external.databaseKey }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.postgresql.external.existingSecret }} name: {{ .Values.postgresql.external.existingSecret }}
@ -104,7 +104,7 @@ spec:
value: {{ .Values.postgresql.external.database | quote }} value: {{ .Values.postgresql.external.database | quote }}
{{- end }} {{- end }}
- name: POSTGRES_USER - name: POSTGRES_USER
{{- if .Values.postgresql.external.existingSecret }} {{- if and .Values.postgresql.external.existingSecret .Values.postgresql.external.userKey }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.postgresql.external.existingSecret }} name: {{ .Values.postgresql.external.existingSecret }}
@ -113,7 +113,7 @@ spec:
value: {{ .Values.postgresql.external.user | quote }} value: {{ .Values.postgresql.external.user | quote }}
{{- end }} {{- end }}
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
{{- if .Values.postgresql.external.existingSecret }} {{- if and .Values.postgresql.external.existingSecret .Values.postgresql.external.passwordKey }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.postgresql.external.existingSecret }} name: {{ .Values.postgresql.external.existingSecret }}

7
charts/joplin-server/values.yaml
View File

@ -128,9 +128,10 @@ postgresql:
existingSecret: "" existingSecret: ""
userKey: "username" userKey: "username"
passwordKey: "password" passwordKey: "password"
hostKey: "host" # Optional: only set if host/port/database are also in the secret
portKey: "port" hostKey: ""
databaseKey: "database" portKey: ""
databaseKey: ""
## Joplin Server Configuration ## Joplin Server Configuration
joplin: joplin: