From 15332a98499cadebbcfcdbfa1ae0f8d9addea8d1 Mon Sep 17 00:00:00 2001
From: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com>
Date: Thu, 15 Oct 2026 11:07:50 +0800
Subject: [PATCH] fix(deploy): default cluster domain for reused Helm values

Signed-off-by: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com>
---
 charts/skillhub/templates/web-deployment.yaml    |  2 +-
 charts/skillhub/tests/configuration-contracts.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/charts/skillhub/templates/web-deployment.yaml b/charts/skillhub/templates/web-deployment.yaml
index 88366122..b92a5ef4 100644
--- a/charts/skillhub/templates/web-deployment.yaml
+++ b/charts/skillhub/templates/web-deployment.yaml
@@ -32,7 +32,7 @@ spec:
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           env:
             - name: SKILLHUB_API_UPSTREAM
-              value: {{ printf "http://%s-server.%s.svc.%s:%v" (include "skillhub.fullname" .) .Release.Namespace .Values.web.clusterDomain .Values.server.service.port | quote }}
+              value: {{ printf "http://%s-server.%s.svc.%s:%v" (include "skillhub.fullname" .) .Release.Namespace (.Values.web.clusterDomain | default "cluster.local") .Values.server.service.port | quote }}
             - name: SKILLHUB_PUBLIC_BASE_URL
               valueFrom:
                 configMapKeyRef:
diff --git a/charts/skillhub/tests/configuration-contracts.sh b/charts/skillhub/tests/configuration-contracts.sh
index c026eb93..4297cf66 100755
--- a/charts/skillhub/tests/configuration-contracts.sh
+++ b/charts/skillhub/tests/configuration-contracts.sh
@@ -57,6 +57,18 @@ render web-dns "$CHART_DIR" --namespace team-skills \
 assert_web_upstream "$TMP_DIR/web-dns-custom.yaml" \
   'http://custom-hub-server.team-skills.svc.k8s.example.internal:9080'
 
+# --reuse-values can supply old chart defaults without this newly added key.
+# Model that effective values shape here; a real cross-version upgrade is a
+# separate integration check, not a second render of this chart's new defaults.
+LEGACY_VALUES_CHART="$TMP_DIR/legacy-values-chart"
+cp -R "$CHART_DIR" "$LEGACY_VALUES_CHART"
+sed '/^  clusterDomain:/d' "$CHART_DIR/values.yaml" >"$LEGACY_VALUES_CHART/values.yaml"
+render web-dns "$LEGACY_VALUES_CHART" --namespace team-skills \
+  --set fullnameOverride=custom-hub --set server.service.port=9080 \
+  --show-only templates/web-deployment.yaml >"$TMP_DIR/web-dns-legacy-values.yaml"
+assert_web_upstream "$TMP_DIR/web-dns-legacy-values.yaml" \
+  'http://custom-hub-server.team-skills.svc.cluster.local:9080'
+
 assert_rejected web-dns-empty-domain --set-string web.clusterDomain=
 assert_rejected web-dns-url-domain --set-string web.clusterDomain=https://cluster.local
 assert_rejected web-dns-empty-label --set-string web.clusterDomain=cluster..local