charts: templates: _helpers: create helper uuid and config map envs only if communicator enabled

Author: maorhalevi-so

charts/s1-agent/templates/_helpers.tpl

@@ -453,6 +453,10 @@ requests:
 {{- end -}}
 
 {{- define "helper.config" -}}
+{{- $helperConfig := dict }}
+{{- $_ := set $helperConfig "S1_HELPER_LOG_SIZE" (.Values.configuration.env.helper.log_size | toString) -}}
+{{- $_ := set $helperConfig "S1_COMMUNICATOR_ENABLED" (printf "%t" .Values.configuration.env.helper.communicator_enabled) -}}
+{{- if .Values.configuration.env.helper.communicator_enabled -}}
 {{- $persistent_uuid := "" -}}
 {{- $uuid := uuidv4 -}}
 {{- $configmap := (lookup "v1" "ConfigMap" .Release.Namespace (include "helper.config.name" .)) }}
@@ -462,12 +466,9 @@ requests:
 {{- if $persistent_uuid }}
 {{- $uuid = $persistent_uuid -}}
 {{- end }}
-{{- $helperConfig := dict "S1_HELPER_UUID" $uuid -}}
+{{- $_ := set $helperConfig "S1_HELPER_UUID" $uuid -}}
 {{- $_ := set $helperConfig "S1_INVENTORY_ENABLED" (printf "%t" .Values.configuration.env.helper.inventory_enabled) -}}
 {{- $_ := set $helperConfig "S1_INVENTORY_ONLY" (printf "%t" .Values.configuration.inventory_only) -}}
-{{- $_ := set $helperConfig "S1_HELPER_LOG_SIZE" (.Values.configuration.env.helper.log_size | toString) -}}
-{{- $_ := set $helperConfig "COMMUNICATOR_ENABLED" (printf "%t" .Values.configuration.env.helper.communicator_enabled) -}}
-{{- if .Values.configuration.env.helper.communicator_enabled -}}
 {{- $_ := set $helperConfig "S1_MANAGEMENT_PROXY" (default "" .Values.configuration.proxy) -}}
 {{- end -}}
 {{- if .Values.configuration.env.injection.enabled -}}