From 58e80d9805f0f6d7f5da29adf35efead9f7b28d9 Mon Sep 17 00:00:00 2001
From: James Baker <jdbaker@dstl.gov.uk>
Date: Mon, 12 May 2025 11:54:33 +0100
Subject: [PATCH] [bitnami/jupyterhub] Init containers can be used with
 external PostgreSQL (#33582)

---
 bitnami/jupyterhub/CHANGELOG.md                  | 8 ++++++--
 bitnami/jupyterhub/Chart.yaml                    | 2 +-
 bitnami/jupyterhub/templates/hub/deployment.yaml | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bitnami/jupyterhub/CHANGELOG.md b/bitnami/jupyterhub/CHANGELOG.md
index 66cd5c4ac2..5dbedfdccc 100644
--- a/bitnami/jupyterhub/CHANGELOG.md
+++ b/bitnami/jupyterhub/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 9.0.7 (2025-05-07)
+## 9.0.8 (2025-05-09)
 
-* [jupyterhub] Fix singleuser image pull secrets ([#33176](https://github.com/bitnami/charts/pull/33176))
+* [bitnami/jupyterhub] Init containers can be used with external PostgreSQL ([#33582](https://github.com/bitnami/charts/pull/33582))
+
+## <small>9.0.7 (2025-05-07)</small>
+
+* [jupyterhub] Fix singleuser image pull secrets (#33176) ([95a3490](https://github.com/bitnami/charts/commit/95a34900e72996e02e0ba14bea719a6f7747e2c2)), closes [#33176](https://github.com/bitnami/charts/issues/33176)
 
 ## <small>9.0.6 (2025-05-06)</small>
 
diff --git a/bitnami/jupyterhub/Chart.yaml b/bitnami/jupyterhub/Chart.yaml
index 9a7d085040..7e79ac5d03 100644
--- a/bitnami/jupyterhub/Chart.yaml
+++ b/bitnami/jupyterhub/Chart.yaml
@@ -38,4 +38,4 @@ maintainers:
 name: jupyterhub
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/jupyterhub
-version: 9.0.7
+version: 9.0.8
diff --git a/bitnami/jupyterhub/templates/hub/deployment.yaml b/bitnami/jupyterhub/templates/hub/deployment.yaml
index c91852437f..a80898b12a 100644
--- a/bitnami/jupyterhub/templates/hub/deployment.yaml
+++ b/bitnami/jupyterhub/templates/hub/deployment.yaml
@@ -74,8 +74,9 @@ spec:
       {{- if .Values.hub.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.hub.terminationGracePeriodSeconds }}
       {{- end }}
-      {{- if .Values.postgresql.enabled }} 
+      {{- if or .Values.postgresql.enabled .Values.hub.initContainers }} 
       initContainers:
+        {{- if .Values.postgresql.enabled }} 
         # NOTE: The value postgresql.image is not available unless postgresql.enabled is not set. We could change this to use os-shell if
         # it had the binary wait-for-port.
         # This init container is for avoiding CrashLoopback errors in the Hub container because the PostgreSQL container is not ready
@@ -125,6 +126,7 @@ spec:
                   key: {{ include "jupyterhub.databaseSecretKey" . }}
             - name: POSTGRESQL_CLIENT_POSTGRES_USER
               value: {{ ternary .Values.postgresql.auth.username .Values.externalDatabase.user .Values.postgresql.enabled | quote }}
+        {{- end }}
         {{- if .Values.hub.initContainers }}
         {{- include "common.tplvalues.render" (dict "value" .Values.hub.initContainers "context" $) | nindent 8 }}
         {{- end }}