Added pod Annotations

Author: abhiyerra

README.md

@@ -143,6 +143,8 @@ apps:
             port: 3000
       autoscaling:
         enabled: false
+      podAnnotations:
+        ad.datadoghq.com/celery.logs: '[{"source": "celery","service": "celery"}]'
     jobs:
       - name: db-migrate
         command: "bundle exec rake db:migrate"

charts/tiphys/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.1
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/tiphys/templates/app.yaml

@@ -66,6 +66,11 @@ metadata:
   name: {{ include "opszero.fullname" $ }}-{{ $app.name }}
   labels:
     {{- include "opszero.selectorLabels" $ | nindent 4 }}-{{ $app.name }}
+    {{- if $.Values.datadog.enabled }}
+    tags.datadoghq.com/env: {{ $.Values.datadog.envName | quote }}
+    tags.datadoghq.com/service: {{ include "opszero.fullname" $ }}-{{ $app.name }}
+    tags.datadoghq.com/version: {{ default $.Values.defaultImage $app.image | quote }}
+    {{- end }}
 spec:
   {{- if not $app.service.autoscaling.enabled }}
   replicas: {{ $.Values.replicaCount }}
@@ -77,8 +82,16 @@ spec:
     metadata:
       annotations:
         rollme: {{ randAlphaNum 5 | quote }}
+        {{- with $app.service.podAnnotations -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
       labels:
       {{- include "opszero.selectorLabels" $ | nindent 8 }}-{{ $app.name }}
+      {{- if $.Values.datadog.enabled }}
+        tags.datadoghq.com/env: {{ $.Values.datadog.envName | quote }}
+        tags.datadoghq.com/service: {{ include "opszero.fullname" $ }}-{{ $app.name }}
+        tags.datadoghq.com/version: {{ default $.Values.defaultImage $app.image | quote }}
+      {{- end }}
     spec:
       containers:
         - name: {{ $.Chart.Name }}

charts/tiphys/values.yaml

@@ -50,6 +50,9 @@ affinity: {}
 secrets: {}
 envRaw: {}
 
+datadog:
+  enabled: false
+
 redis:
   enabled: false
   auth: