diff --git a/install/kubernetes/helm/istio/files/injection-template.yaml b/install/kubernetes/helm/istio/files/injection-template.yaml index c4fd9952a3e6..b8aac6c67556 100644 --- a/install/kubernetes/helm/istio/files/injection-template.yaml +++ b/install/kubernetes/helm/istio/files/injection-template.yaml @@ -172,12 +172,18 @@ containers: valueFrom: fieldRef: fieldPath: spec.serviceAccountName -{{ if eq .Values.global.proxy.tracer "datadog" }} +{{- if eq .Values.global.proxy.tracer "datadog" }} - name: HOST_IP valueFrom: fieldRef: fieldPath: status.hostIP -{{ end }} +{{- if isset .ObjectMeta.Annotations `apm.datadoghq.com/env` }} +{{- range $key, $value := fromJSON (index .ObjectMeta.Annotations `apm.datadoghq.com/env`) }} + - name: {{ $key }} + value: "{{ $value }}" +{{- end }} +{{- end }} +{{- end }} - name: ISTIO_META_POD_NAME valueFrom: fieldRef: