From fe69c2f696d7ff6da8538018e53d4b2a0f69988c Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Tue, 18 Mar 2025 12:56:19 +0100
Subject: [PATCH] Don't use common.names.fullname; fix error with null
 postgresql hostname (#179)

---
 CHANGELOG.md           | 5 +++++
 Chart.yaml             | 2 +-
 templates/_helpers.tpl | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d2e18e..f4a01c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 6.2.1
+
+- Fixed some situations where disabling all bitnami charts caused it to error.
+- Fixed a potential null postgresql host value error.
+
 # 6.2.0
 
 - Added ability to add pod labels to pods created from Deployment objects at the global level
diff --git a/Chart.yaml b/Chart.yaml
index bd34467..1683d61 100644
--- a/Chart.yaml
+++ b/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: 6.2.0
+version: 6.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 6f32cfd..09bbb0a 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -92,7 +92,7 @@ Create the name of the assets persistent volume to use
 {{- if .Values.mastodon.persistence.assets.existingClaim }}
     {{- printf "%s" (tpl .Values.mastodon.persistence.assets.existingClaim $) -}}
 {{- else -}}
-    {{- printf "%s-assets" (include "common.names.fullname" .) -}}
+    {{- printf "%s-assets" (include "mastodon.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
@@ -103,7 +103,7 @@ Create the name of the system persistent volume to use
 {{- if .Values.mastodon.persistence.system.existingClaim }}
     {{- printf "%s" (tpl .Values.mastodon.persistence.system.existingClaim $) -}}
 {{- else -}}
-    {{- printf "%s-system" (include "common.names.fullname" .) -}}
+    {{- printf "%s-system" (include "mastodon.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
@@ -130,7 +130,7 @@ Establish which values we will use for remote connections
 {{- if .Values.postgresql.enabled }}
 {{- printf "%s" (include "mastodon.postgresql.fullname" .) -}}
 {{- else }}
-{{- printf "%s" .Values.postgresql.postgresqlHostname -}}
+{{- printf "%s" (required "When the postgresql chart is disabled .Values.postgresql.postgresqlHostname is required" .Values.postgresql.postgresqlHostname) -}}
 {{- end }}
 {{- end }}