fix tests

Author: dineshg13

charts/datadog/templates/NOTES.txt

@@ -582,7 +582,7 @@ More information about this change: https://github.com/DataDog/helm-charts/pull/
 {{- end }}
 
 
-{{- if and (include "should-enable-otel-agent" .) .Values.providers.gke.autopilot }}
+{{- if and (include "should-enable-otel-agent" .root) .Values.providers.gke.autopilot }}
 #################################################################
 ####               WARNING: Configuration notice             ####
 #################################################################

charts/datadog/templates/_helpers.tpl

@@ -114,7 +114,7 @@ Create chart name and version as used by the chart label.
 Return true if the OTelAgent needs to be deployed
 */}}
 {{- define "should-enable-otel-agent" -}}
-{{- if and .Values.datadog.otelCollector.enabled -}}
+{{- if and .datadog.otelCollector.enabled -}}
 true
 {{- else -}}
 false
@@ -319,10 +319,9 @@ Return a remote image path based on `.Values` (passed as root) and `.` (any `.im
 {{- if .image.tagSuffix -}}
 {{- $tagSuffix = printf "-%s" .image.tagSuffix -}}
 {{- end -}}
-{{- if "should-enable-otel-agent" -}}
+{{- if and (not (hasSuffix "-ot-beta" .image.tag)) (not (hasSuffix "-ot-beta" $tagSuffix)) -}}
 {{- $tagSuffix = printf "-ot-beta" -}}
 {{- end -}}
-
 {{- if .image.repository -}}
 {{- .image.repository -}}:{{ .image.tag }}{{ $tagSuffix }}
 {{- else -}}

charts/datadog/templates/daemonset.yaml

@@ -128,7 +128,7 @@ spec:
         {{- if eq  (include "should-enable-security-agent" .) "true" }}
           {{- include "container-security-agent" . | nindent 6 }}
         {{- end }}
-        {{- if eq (include "should-enable-otel-agent" .) "true" }}
+        {{- if eq (include "should-enable-otel-agent" .root) "true" }}
           {{- include "container-otel-agent" . | nindent 6 }}
         {{- end }}
       initContainers:

charts/datadog/templates/otel-configmap.yaml

@@ -1,4 +1,4 @@
-{{- if eq (include "should-enable-otel-agent" .) "true" }}
+{{- if eq (include "should-enable-otel-agent" .root) "true" }}
 apiVersion: v1
 kind: ConfigMap
 metadata: