Merge pull request #23 from Intreecom/feat/instrumentation-labels-and-annotations-support

Added support for instrumentation annotations and labels.

Author: devjadeja-intree

charts/py-app/templates/deployment.yaml

@@ -20,13 +20,16 @@ spec:
       deployment_type: web
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- $podAnnotations := merge (deepCopy (default dict .Values.podAnnotations)) (default dict .Values.instrumentation.annotations) }}
+      {{- with $podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- $baseSelectorLabels := (include "py-app.selectorLabels" . | fromYaml) }}
+      {{- $_ := set $baseSelectorLabels "deployment_type" "web" }}
+      {{- $mergedLabels := merge $baseSelectorLabels (default dict .Values.instrumentation.labels) }}
       labels:
-        {{- include "py-app.selectorLabels" . | nindent 8 }}
-        deployment_type: web
+        {{- toYaml $mergedLabels | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

charts/py-app/values.yaml

@@ -13,6 +13,11 @@ replicaCount: 1
 # it will be put directly in containers.
 env: {}
 
+# annotations and/or labels for zero-code instrumentation support (OpenTelemetry Collector and Grafana Beyla)
+instrumentation:
+  annotations: {}
+  labels: {}
+
 # Definition of migrator jobs.
 #
 # This should