Merge pull request #26 from Intreecom/feat/instrumentation-on-off-switch-for-taskiq

Separate switches to on/off instrumentation for workers and schedulers

Author: devjadeja-intree

charts/py-app/templates/taskiq-scheduler.yaml

@@ -13,15 +13,15 @@ spec:
       deployment_type: tkq-scheduler
   template:
     metadata:
-      {{- $instrumentationAnnotations := ternary (default dict .Values.instrumentation.annotations) dict .Values.taskiq.instrumentation.enabled }}
+      {{- $instrumentationAnnotations := ternary (default dict .Values.instrumentation.annotations) dict .Values.taskiq.instrumentation.scheduler.enabled }}
       {{- $podAnnotations := merge (deepCopy (default dict .Values.podAnnotations)) $instrumentationAnnotations }}
       {{- with $podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- $baseSelectorLabels := (include "py-app.selectorLabels" . | fromYaml) }}
       {{- $_ := set $baseSelectorLabels "deployment_type" "tkq-scheduler" }}
-      {{- $instrumentationLabels := ternary (default dict .Values.instrumentation.labels) dict .Values.taskiq.instrumentation.enabled }}
+      {{- $instrumentationLabels := ternary (default dict .Values.instrumentation.labels) dict .Values.taskiq.instrumentation.scheduler.enabled }}
       {{- $mergedLabels := merge $baseSelectorLabels $instrumentationLabels }}
       labels:
         {{- toYaml $mergedLabels | nindent 8 }}

charts/py-app/templates/taskiq-worker.yaml

@@ -19,15 +19,15 @@ spec:
       deployment_type: tkq-worker
   template:
     metadata:
-      {{- $instrumentationAnnotations := ternary (default dict .Values.instrumentation.annotations) dict .Values.taskiq.instrumentation.enabled }}
+      {{- $instrumentationAnnotations := ternary (default dict .Values.instrumentation.annotations) dict .Values.taskiq.instrumentation.worker.enabled }}
       {{- $podAnnotations := merge (deepCopy (default dict .Values.podAnnotations)) $instrumentationAnnotations }}
       {{- with $podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- $baseSelectorLabels := (include "py-app.selectorLabels" . | fromYaml) }}
       {{- $_ := set $baseSelectorLabels "deployment_type" "tkq-worker" }}
-      {{- $instrumentationLabels := ternary (default dict .Values.instrumentation.labels) dict .Values.taskiq.instrumentation.enabled }}
+      {{- $instrumentationLabels := ternary (default dict .Values.instrumentation.labels) dict .Values.taskiq.instrumentation.worker.enabled }}
       {{- $mergedLabels := merge $baseSelectorLabels $instrumentationLabels }}
       labels:
         {{- toYaml $mergedLabels | nindent 8 }}

charts/py-app/values.yaml

@@ -38,7 +38,10 @@ taskiq:
   resources: {}
   workers: 1
   instrumentation:
-    enabled: false
+    worker:
+      enabled: false
+    scheduler:
+      enabled: false
   autoscaling:
     enabled: false
     minReplicas: 1