Fixed bug with joplin server helm chart with secret values

charts/joplin-server/Chart.yaml

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

charts/joplin-server/readme.md

@@ -104,9 +104,9 @@ $ helm uninstall joplin-server
 | `postgresql.external.existingSecret`   | Name of existing secret with PostgreSQL credentials | `""`      |
 | `postgresql.external.userKey`          | Key in the secret for username               | `username` |
 | `postgresql.external.passwordKey`      | Key in the secret for password               | `password` |
-| `postgresql.external.hostKey`          | Key in the secret for host                   | `host`    |
-| `postgresql.external.portKey`          | Key in the secret for port                   | `port`    |
-| `postgresql.external.databaseKey`      | Key in the secret for database name          | `database` |
+| `postgresql.external.hostKey`          | Key in the secret for host (optional)        | `""`      |
+| `postgresql.external.portKey`          | Key in the secret for port (optional)        | `""`      |
+| `postgresql.external.databaseKey`      | Key in the secret for database name (optional) | `""`      |
 
 ### Joplin Server Configuration
 
@@ -308,6 +308,7 @@ joplin:
 
 ### Using Kubernetes Secrets
 
+#### Full Secret Configuration
 ```yaml
 postgresql:
   external:
@@ -326,6 +327,20 @@ joplin:
     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
 
 ```yaml

charts/joplin-server/templates/deployment.yaml

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

charts/joplin-server/values.yaml

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