fix(deploy): default cluster domain for reused Helm values

Signed-off-by: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com>
This commit is contained in:
XiaoSeS 2026-10-15 11:07:50 +08:00
parent b095b242a4
commit 15332a9849
2 changed files with 13 additions and 1 deletions

View file

@ -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:

View file

@ -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