From 0b207d3efba8efea21e1619ca9ca755a301b4bf9 Mon Sep 17 00:00:00 2001
From: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>
Date: Mon, 26 Feb 2024 18:17:18 +0200
Subject: [PATCH] [bitnami/jupyterhub] Fix global image registry not being
 respected in jupyterhub configuration (#23881)

- fixes a bug where when setting global.imageRegistry some images were still using docker.io

Signed-off-by: Nisan Ohana <nisana230@gmail.com>
---
 bitnami/jupyterhub/Chart.yaml  | 2 +-
 bitnami/jupyterhub/values.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitnami/jupyterhub/Chart.yaml b/bitnami/jupyterhub/Chart.yaml
index f44c732287..200a590422 100644
--- a/bitnami/jupyterhub/Chart.yaml
+++ b/bitnami/jupyterhub/Chart.yaml
@@ -37,4 +37,4 @@ maintainers:
 name: jupyterhub
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/jupyterhub
-version: 5.8.2
+version: 5.8.3
diff --git a/bitnami/jupyterhub/values.yaml b/bitnami/jupyterhub/values.yaml
index 49f4819c2a..3a6f510442 100644
--- a/bitnami/jupyterhub/values.yaml
+++ b/bitnami/jupyterhub/values.yaml
@@ -153,7 +153,7 @@ hub:
       {{- end }}
       networkTools:
         image:
-          name: {{ include "jupyterhub.hubconfiguration.imageEntry" ( dict "imageRoot" .Values.auxiliaryImage "global" $) }}
+          name: {{ include "jupyterhub.hubconfiguration.imageEntry" ( dict "imageRoot" .Values.auxiliaryImage "global" .Values.global) }}
           tag: {{ .Values.auxiliaryImage.tag }}
           digest: {{ .Values.auxiliaryImage.digest }}
           pullPolicy: {{ .Values.auxiliaryImage.pullPolicy }}
@@ -224,7 +224,7 @@ hub:
           volumeNameTemplate: {{ include "common.names.fullname" . }}-volume-{username}{servername}
           storageAccessModes: {{- include "common.tplvalues.render" ( dict "value" .Values.singleuser.persistence.accessModes "context" $ ) | nindent 8 }}
       image:
-        name: {{ include "jupyterhub.hubconfiguration.imageEntry" ( dict "imageRoot" .Values.singleuser.image "global" $) }}
+        name: {{ include "jupyterhub.hubconfiguration.imageEntry" ( dict "imageRoot" .Values.singleuser.image "global" .Values.global) }}
         tag: {{ .Values.singleuser.image.tag }}
         digest: {{ .Values.singleuser.image.digest }}
         pullPolicy: {{ .Values.singleuser.image.pullPolicy }}