Skip to content

Commit de6264c

Browse files
committed
use set function instead of merge
merge does a deep merge, but that could cause weird problems if two different livenessProbe definitions were merged and other things that would not make sense. Instead, we use set to mutate the $sensor dictionary applying the override values on top of the defaults, effectively merging only one level of the dictionaries.
1 parent 9027a0f commit de6264c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

templates/deployments.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,10 @@ spec:
982982
{{- end }}
983983

984984
{{- range .Values.st2.packs.sensors }}
985-
{{- $sensor := deepCopy $.Values.st2sensorcontainer | mustMergeOverwrite . }}
985+
{{- $sensor := omit $.Values.st2sensorcontainer "name" "ref" "postStartScript" }}
986+
{{- range $key, $val := . }}
987+
{{- $_ := set $sensor $key $val }}
988+
{{- end }}
986989
{{- $name := print "st2sensorcontainer" (include "hyphenPrefix" $sensor.name) }}
987990
---
988991
apiVersion: apps/v1

0 commit comments

Comments
 (0)