From d8325acfae8774cf0aa9ef080975b8e58f9c96d3 Mon Sep 17 00:00:00 2001
From: henrygd <hank@henrygd.me>
Date: Sat, 17 Oct 2026 09:43:46 -0400
Subject: [PATCH] fix(helm): omit empty env and envFrom in hub deployment

Wrap env and envFrom in with blocks so they aren't rendered as null keys
when unset, document both values with examples, and bump chart to 0.1.9.
---
 supplemental/helm/beszel-hub/Chart.yaml                | 2 +-
 supplemental/helm/beszel-hub/templates/deployment.yaml | 8 +++++---
 supplemental/helm/beszel-hub/values.yaml               | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/supplemental/helm/beszel-hub/Chart.yaml b/supplemental/helm/beszel-hub/Chart.yaml
index 70f519e12..0080bd453 100644
--- a/supplemental/helm/beszel-hub/Chart.yaml
+++ b/supplemental/helm/beszel-hub/Chart.yaml
@@ -4,7 +4,7 @@ home: https://github.com/henrygd/beszel/tree/main/supplemental/helm/beszel-hub
 name: beszel-hub
 appVersion: "0.21.0"
 # Bump this version when publishing chart changes.
-version: 0.1.8
+version: 0.1.9
 sources:
   - https://github.com/henrygd/beszel/tree/main/supplemental/helm/beszel-hub
   - https://www.beszel.dev/
diff --git a/supplemental/helm/beszel-hub/templates/deployment.yaml b/supplemental/helm/beszel-hub/templates/deployment.yaml
index c60b7f846..a925274e5 100644
--- a/supplemental/helm/beszel-hub/templates/deployment.yaml
+++ b/supplemental/helm/beszel-hub/templates/deployment.yaml
@@ -50,15 +50,17 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+          {{- with .Values.envFrom }}
           envFrom:
-            {{- with .Values.envFrom }}
             {{- toYaml . | nindent 12 }}
-            {{- end }}
+          {{- end }}
+          {{- with .Values.env }}
           env:
-            {{- range $key, $value := .Values.env }}
+            {{- range $key, $value := . }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
+          {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe:
             {{- toYaml . | nindent 12 }}
diff --git a/supplemental/helm/beszel-hub/values.yaml b/supplemental/helm/beszel-hub/values.yaml
index 2da06a1b0..112efe235 100644
--- a/supplemental/helm/beszel-hub/values.yaml
+++ b/supplemental/helm/beszel-hub/values.yaml
@@ -116,9 +116,17 @@ autoscaling:
 
 # volumeMounts: {}
 
+# -- Environment variables for the hub container
 env: {}
+  # APP_URL: https://beszel.example.com
+  # DISABLE_PASSWORD_AUTH: "true"
 
+# -- Load environment variables from Secrets or ConfigMaps
 envFrom: []
+  # - secretRef:
+  #     name: beszel-hub-env
+  # - configMapRef:
+  #     name: beszel-hub-config
 
 # -- `spec.PersitentVolumeClaim` configuration
 persistentVolumeClaim: