Skip to content

fix(common): configmap passthrough in serviceDiscovery/streaming env helpers + streaming knobs #1772

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

Merged
guimoreirar merged 1 commit into from
Jul 30, 2026
Merged

fix(common): configmap passthrough in serviceDiscovery/streaming env helpers + streaming knobs #1772

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
29 changes: 19 additions & 10 deletions charts/lerian-common/templates/_service_discovery.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,22 @@ Inputs (dict):
namespace (req) resolved namespace string
ingressHost (opt) external host; when non-empty, emits SD_EXTERNAL_*
(omit for consumer-only / internal-only instances)
configmap (opt) the component's legacy `.configmap` map. When a key is
present here, its flat `configmap.SD_*` value WINS over the
global/derived value below (backward-compat for the flat
configmap API). Defaults to an empty dict → every key falls
through to the derived value (byte-identical to no-configmap).

global.serviceDiscovery (all optional except address when enabled):
address, tls, tlsSkipVerify, workload, preferView, internalScheme, externalPort
==============================================================================
*/}}
{{- define "lerian-common.serviceDiscovery.env" -}}
{{- $sd := (.context.Values.global | default dict).serviceDiscovery | default dict -}}
{{- /* Legacy flat configmap source: a present `configmap.SD_*` key WINS over the
global/derived value (mirrors multiTenant.env). Empty dict when omitted, so a
no-configmap caller renders byte-identical to before. */ -}}
{{- $c := .configmap | default dict -}}
{{- /*
Derive ONLY when enabled AND global.serviceDiscovery.address is configured.
This keeps adoption backward-compatible: a chart carrying this helper but
Expand All @@ -51,17 +60,17 @@ global.serviceDiscovery (all optional except address when enabled):
{{- /* SD_ENABLED is NOT emitted here: it is the app's single knob and is
rendered by the component's own extraEnvVars passthrough. Emitting it again
would produce a duplicate key. This helper only adds the derived siblings. */ -}}
SD_ADDRESS: {{ $sd.address | quote }}
SD_TLS: {{ $sd.tls | default false | quote }}
SD_TLS_SKIP_VERIFY: {{ $sd.tlsSkipVerify | default false | quote }}
SD_WORKLOAD: {{ $sd.workload | default "" | quote }}
SD_PREFER_VIEW: {{ $sd.preferView | default "internal" | quote }}
SD_INTERNAL_ADDRESS: {{ include "lerian-common.internalHost" (dict "name" .name "namespace" .namespace) | quote }}
SD_INTERNAL_PORT: {{ .port | quote }}
SD_INTERNAL_SCHEME: {{ $sd.internalScheme | default "http" | quote }}
SD_ADDRESS: {{ index $c "SD_ADDRESS" | default $sd.address | quote }}
SD_TLS: {{ index $c "SD_TLS" | default ($sd.tls | default false) | quote }}
SD_TLS_SKIP_VERIFY: {{ index $c "SD_TLS_SKIP_VERIFY" | default ($sd.tlsSkipVerify | default false) | quote }}
SD_WORKLOAD: {{ index $c "SD_WORKLOAD" | default ($sd.workload | default "") | quote }}
SD_PREFER_VIEW: {{ index $c "SD_PREFER_VIEW" | default ($sd.preferView | default "internal") | quote }}
SD_INTERNAL_ADDRESS: {{ index $c "SD_INTERNAL_ADDRESS" | default (include "lerian-common.internalHost" (dict "name" .name "namespace" .namespace)) | quote }}
SD_INTERNAL_PORT: {{ index $c "SD_INTERNAL_PORT" | default .port | quote }}
SD_INTERNAL_SCHEME: {{ index $c "SD_INTERNAL_SCHEME" | default ($sd.internalScheme | default "http") | quote }}
{{- if .ingressHost }}
SD_EXTERNAL_ADDRESS: {{ printf "https://%s" .ingressHost | quote }}
SD_EXTERNAL_PORT: {{ $sd.externalPort | default 443 | quote }}
SD_EXTERNAL_ADDRESS: {{ index $c "SD_EXTERNAL_ADDRESS" | default (printf "https://%s" .ingressHost) | quote }}
SD_EXTERNAL_PORT: {{ index $c "SD_EXTERNAL_PORT" | default ($sd.externalPort | default 443) | quote }}
{{- end }}
{{- end -}}
{{- end -}}
Expand Down
30 changes: 23 additions & 7 deletions charts/lerian-common/templates/_streaming.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,39 @@ Inputs (dict):
enabled (req) bool — whether to emit the constants
clientId (opt) STREAMING_CLIENT_ID — emitted only when provided
cloudeventsSource (opt) STREAMING_CLOUDEVENTS_SOURCE — emitted only when provided
configmap (opt) the component's legacy `.configmap` map. When a key is
present here, its flat `configmap.STREAMING_*` value
WINS over the global value below (backward-compat for
the flat configmap API). Defaults to an empty dict → every
key falls through to global/default (byte-identical to
a no-configmap caller, aside from the new knobs below).

global.streaming (all optional except brokers, which gates emission):
brokers, tlsEnabled, saslMechanism, saslUsername
brokers, tlsEnabled, saslMechanism, saslUsername, saslAllowPlaintext,
compression, requiredAcks, batchLingerMs, importantEmitTimeoutMs
==============================================================================
*/}}
{{- define "lerian-common.streaming.env" -}}
{{- $s := (.context.Values.global | default dict).streaming | default dict -}}
{{- /* Legacy flat configmap source: a present `configmap.STREAMING_*` key WINS
over the global value (mirrors multiTenant.env / serviceDiscovery.env). Empty
dict when omitted. */ -}}
{{- $c := .configmap | default dict -}}
{{- if and .enabled $s.brokers -}}
STREAMING_BROKERS: {{ $s.brokers | quote }}
STREAMING_TLS_ENABLED: {{ $s.tlsEnabled | default false | quote }}
STREAMING_SASL_MECHANISM: {{ $s.saslMechanism | default "" | quote }}
STREAMING_SASL_USERNAME: {{ $s.saslUsername | default "" | quote }}
STREAMING_BROKERS: {{ index $c "STREAMING_BROKERS" | default $s.brokers | quote }}
STREAMING_TLS_ENABLED: {{ index $c "STREAMING_TLS_ENABLED" | default ($s.tlsEnabled | default false) | quote }}
STREAMING_SASL_MECHANISM: {{ index $c "STREAMING_SASL_MECHANISM" | default ($s.saslMechanism | default "") | quote }}
STREAMING_SASL_USERNAME: {{ index $c "STREAMING_SASL_USERNAME" | default ($s.saslUsername | default "") | quote }}
STREAMING_SASL_ALLOW_PLAINTEXT: {{ index $c "STREAMING_SASL_ALLOW_PLAINTEXT" | default ($s.saslAllowPlaintext | default "false") | quote }}
STREAMING_COMPRESSION: {{ index $c "STREAMING_COMPRESSION" | default ($s.compression | default "lz4") | quote }}
STREAMING_REQUIRED_ACKS: {{ index $c "STREAMING_REQUIRED_ACKS" | default ($s.requiredAcks | default "all") | quote }}
STREAMING_BATCH_LINGER_MS: {{ index $c "STREAMING_BATCH_LINGER_MS" | default ($s.batchLingerMs | default "5") | quote }}
STREAMING_IMPORTANT_EMIT_TIMEOUT_MS: {{ index $c "STREAMING_IMPORTANT_EMIT_TIMEOUT_MS" | default ($s.importantEmitTimeoutMs | default "5000") | quote }}
{{- if hasKey . "clientId" }}
STREAMING_CLIENT_ID: {{ .clientId | quote }}
STREAMING_CLIENT_ID: {{ index $c "STREAMING_CLIENT_ID" | default .clientId | quote }}
{{- end }}
{{- if hasKey . "cloudeventsSource" }}
STREAMING_CLOUDEVENTS_SOURCE: {{ .cloudeventsSource | quote }}
STREAMING_CLOUDEVENTS_SOURCE: {{ index $c "STREAMING_CLOUDEVENTS_SOURCE" | default .cloudeventsSource | quote }}
{{- end }}
{{- end -}}
{{- end -}}
Expand Down
Loading