Set environment variables via annotation (istio#16594)

mfilipiak-ccg · Aug 29, 2019 · 5379131 · 5379131
1 parent f1ba4e1
commit 5379131
Showing 1 changed file with 8 additions and 2 deletions.
diff --git 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: