Skip to content

Commit 6a7ee4c

Browse files
fix(chart): normalize mqtt stream sources (#29)
Render empty source transform destinations explicitly. This matches the Stream specs that NACK writes back in control-loop mode. Keep the NACK control loop enabled. Signed-off-by: Frank Spitulski <fspitulski@nvidia.com>
1 parent 47ebb73 commit 6a7ee4c

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

deploy/nats-event-bus/templates/mqtt-streams.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ spec:
3636
subjectTransforms:
3737
{{- range $crossLayer.cscExports }}
3838
- source: {{ printf "$MQTT.msgs.%s" . | quote }}
39+
dest: "" {{- /* NACK persists omitted destinations this way; keep SSA aligned. */}}
3940
{{- end }}
4041
{{- range $crossLayer.cscPrefixedExports }}
4142
- source: {{ printf "$MQTT.msgs.cpc.%s.%s" $clusterId . | quote }}
@@ -70,6 +71,7 @@ spec:
7071
subjectTransforms:
7172
{{- range $crossLayer.cscExports }}
7273
- source: {{ printf "$MQTT.rmsgs.%s" . | quote }}
74+
dest: "" {{- /* NACK persists omitted destinations this way; keep SSA aligned. */}}
7375
{{- end }}
7476
{{- range $crossLayer.cscPrefixedExports }}
7577
- source: {{ printf "$MQTT.rmsgs.cpc.%s.%s" $clusterId . | quote }}

local/nats/deploy.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,8 @@ else
404404
VALUES_FILES="${VALUES_FILES} -f ${SCRIPT_DIR}/k8s/${cluster}/values.yaml"
405405
fi
406406

407-
# TODO: Investigate nack jetstream-controller taking ownership of .spec.sources via Update
408-
# This causes server-side apply conflicts with Helm. Using --force-conflicts as workaround.
409-
# See: https://github.com/nats-io/nack
407+
# Keep force-conflicts for source/topology changes where NACK control-loop mode
408+
# owns existing Stream source fields.
410409
helm upgrade --install nats-event-bus "${CHART_DIR}" \
411410
--namespace ${namespace} \
412411
${VALUES_FILES} \

0 commit comments

Comments
 (0)