Skip to content

fix: decouple TLS from ingress in configmap template #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krajtar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: decouple TLS from ingress in configmap template #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions helm/huly/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{{- $proto := ternary "https" "http" (and .Values.ingress.enabled .Values.ingress.tls.enabled) -}}
{{- $wsProto := ternary "wss" "ws" (and .Values.ingress.enabled .Values.ingress.tls.enabled) -}}
{{- /* TLS is terminated at the ingress OR an external gateway (Gateway API, etc.) */ -}}
{{- $tlsEnabled := .Values.tls.enabled | default (and .Values.ingress.enabled .Values.ingress.tls.enabled) -}}
{{- $proto := ternary "https" "http" $tlsEnabled -}}
{{- $wsProto := ternary "wss" "ws" $tlsEnabled -}}

{{- /* Resolve infra endpoints: built-in pod name or external URL */ -}}
{{- $elasticUrl := ternary "http://elastic:9200" .Values.external.elastic .Values.elastic.enabled -}}
Expand Down
9 changes: 9 additions & 0 deletions helm/huly/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ storage:
# bucketPrefix: prefix prepended to per-workspace bucket names (only used if rootBucket is empty)
bucketPrefix: "" # e.g. huly-

# ──────────────────────────────────────────────────────────────
# TLS — controls https/wss URLs in the ConfigMap
# Set tls.enabled=true when TLS is terminated at an external gateway
# (Gateway API, LoadBalancer, etc.) even if ingress.enabled=false.
# Defaults to ingress.tls.enabled for backward compatibility.
# ──────────────────────────────────────────────────────────────
tls:
enabled: ""

# ──────────────────────────────────────────────────────────────
# Ingress
# ──────────────────────────────────────────────────────────────
Expand Down