comment and use mustMergeOverwrite

Author: james-rms

charts/primary-site/templates/_helpers.tpl

@@ -2,6 +2,10 @@
 {{- .Values.globals.indexingStrategy | default "split-files" -}}
 {{- end -}}
 
+# stream service was renamed to query engine.
+# some users have values defined under the legacy `streamService` namespace.
+# We define defaults in the `queryEngine` namespace.
+# User values in `streamService` should override defaults in `values.yaml` for `queryEngine`.
 {{- define "primary-site.mergedQueryEngineValues" -}}
-{{- mustMerge (.Values.queryEngine | default dict) (.Values.streamService | default dict) | toYaml }}
+{{- mustMergeOverwrite (.Values.queryEngine | default dict) (.Values.streamService | default dict) | toYaml }}
 {{- end -}}

charts/primary-site/templates/services/query-engine.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: queryEngine
+  name: query-engine
   annotations:
     {{- range $key, $value := $values.service.annotations }}
     {{ $key }}: {{ $value | quote }}

charts/primary-site/values.yaml

@@ -175,7 +175,7 @@ indexer:
       enabled: false
       annotations: {}
 
-streamService:
+queryEngine:
   service:
     annotations: {}
   deployment: