Merge pull request #15 from small-hack/fix/db-host-templating

fix db host templating

Author: jessebot

charts/pixelfed/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1
+version: 0.4.2
 
 # This is the version number of the application being deployed.
 # renovate:image=ghcr.io/mattlqx/docker-pixelfed

charts/pixelfed/README.md

@@ -1,6 +1,6 @@
 # pixelfed
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
+![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
 
 A Helm chart for deploying Pixelfed on Kubernetes
 

charts/pixelfed/templates/deployment.yaml

@@ -270,15 +270,14 @@ spec:
             - name: DB_CONNECTION
               value: {{ .Values.externalDatabase.connection }}
             - name: DB_HOST
-              {{- if .Values.externalDatabase.enabled }}
-              {{- if .Values.externalDatabase.existingSecret }}
+              {{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.externalDatabase.existingSecret }}
                   key: {{ .Values.externalDatabase.existingSecretKeys.host }}
-              {{- else }}
+              {{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
               value: {{ .Values.externalDatabase.host }}
-              {{- end }}
+              {{- else }}
               value: {{  .Values.postgresql.fullnameOverride  }}
               {{- end }}
             - name: DB_USERNAME