chore(setup,cleanup): don't template *.sh and *.tf files

SumoLogic · Jun 18, 2024 · 09d960b · 09d960b
1 parent b561aa0
commit 09d960b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/deploy/helm/sumologic/conf/setup/monitors.sh b/deploy/helm/sumologic/conf/setup/monitors.sh
@@ -80,7 +80,7 @@ if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
   )
 
   if [ -z ${SUMOLOGIC_MONITORS_NOTIFICATIONS_RECIPIENTS+x} ]; then
-    NOTIFICATIONS_CONTENT="subject=\"Monitor Alert: {{ printf `{{TriggerType}}` }} on {{ printf `{{Name}}` }}\",message_body=\"Triggered {{ printf `{{TriggerType}}` }} alert on {{ printf `{{Name}}` }}: {{ printf `{{QueryURL}}` }}\""
+    NOTIFICATIONS_CONTENT="subject=\"Monitor Alert: {{TriggerType}} on {{Name}}\",message_body=\"Triggered {{TriggerType}} alert on {{Name}}: {{QueryURL}}\""
     NOTIFICATIONS_SETTINGS="recipients=${SUMOLOGIC_MONITORS_NOTIFICATIONS_RECIPIENTS},connection_type=\"Email\",time_zone=\"UTC\""
     TERRAFORM_ARGS+=(
       -var="email_notifications_critical=[{${NOTIFICATIONS_SETTINGS},${NOTIFICATIONS_CONTENT},run_for_trigger_types=[\"Critical\", \"ResolvedCritical\"]}]"

diff --git a/deploy/helm/sumologic/templates/cleanup/configmap.yaml b/deploy/helm/sumologic/templates/cleanup/configmap.yaml
@@ -10,6 +10,7 @@ metadata:
     app: {{ template "sumologic.labels.app.cleanup.configmap" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 data:
-  {{- (tpl (.Files.Glob "conf/cleanup/cleanup.sh").AsConfig .) | nindent 2 }}
-  {{- (tpl (.Files.Glob "conf/setup/*").AsConfig .) | nindent 2 }}
+  {{- (.Files.Glob "conf/cleanup/cleanup.sh").AsConfig | nindent 2 }}
+  {{- (.Files.Glob "conf/setup/*.{tf,sh}").AsConfig | nindent 2 }}
+  {{- (tpl (.Files.Glob "conf/setup/*.json").AsConfig .) | nindent 2 }}
 {{- end }}
diff --git a/deploy/helm/sumologic/templates/setup/configmap.yaml b/deploy/helm/sumologic/templates/setup/configmap.yaml
@@ -10,5 +10,6 @@ metadata:
     app: {{ template "sumologic.labels.app.setup.configmap" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 data:
-  {{- (tpl (.Files.Glob "conf/setup/*").AsConfig .) | nindent 2 }}
+  {{- (.Files.Glob "conf/setup/*.{tf,sh}").AsConfig | nindent 2 }}
+  {{- (tpl (.Files.Glob "conf/setup/*.json").AsConfig .) | nindent 2 }}
 {{- end }}