ci: add scout container to celery pod (#7354)

* ci: Add scout container to celery pod

* ci: Refactor scoutapm settings in values.yaml

helm/templates/deployments/celery.yaml

@@ -27,6 +27,17 @@ spec:
       securityContext:
         {{- toYaml $podValues.podSecurityContext | nindent 8 }}
       containers:
+        {{- if .Values.scoutapm }}
+        - name: "scoutapm"
+          image: "{{ .Values.scoutapm.image.repository }}:{{ default "latest" .Values.scoutapm.image.tag }}"
+          imagePullPolicy: {{ default "IfNotPresent" .Values.scoutapm.image.imagePullPolicy }}
+          livenessProbe:
+            exec:
+              command:
+                - "sh"
+                - "-c"
+                - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'"
+        {{- end }}
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml $podValues.securityContext | nindent 12 }}

helm/templates/deployments/datatracker.yaml

@@ -27,10 +27,10 @@ spec:
       securityContext:
         {{- toYaml $podValues.podSecurityContext | nindent 8 }}
       containers:
-        {{- if $podValues.scoutapm }}
+        {{- if .Values.scoutapm }}
         - name: "scoutapm"
-          image: "{{ $podValues.scoutapm.image.repository }}:{{ default "latest" $podValues.scoutapm.image.tag }}"
+          image: "{{ .Values.scoutapm.image.repository }}:{{ default "latest" .Values.scoutapm.image.tag }}"
-          imagePullPolicy: {{ default "IfNotPresent" $podValues.scoutapm.image.imagePullPolicy }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.scoutapm.image.imagePullPolicy }}
           livenessProbe:
             exec:
               command:

helm/values.yaml

@@ -166,12 +166,6 @@ datatracker:
   nodeSelector: {}
 
   affinity: {}
-  
-  # Set this to enable a Scout APM Core Agent sidecar
-  scoutapm:
-    image:
-      repository: "scoutapp/scoutapm"
-      tag: "version-1.4.0"
 
 # -------------------------------------------------------------
 # CELERY
@@ -567,6 +561,15 @@ memcached:
 
   affinity: {}
 
+# -------------------------------------------------------------
+# SCOUT APM SETTINGS
+# -------------------------------------------------------------
+# Set this to enable a Scout APM Core Agent sidecar
+scoutapm:
+  image:
+    repository: "scoutapp/scoutapm"
+    tag: "version-1.4.0"
+
 # -------------------------------------------------------------
 # PERSISTENT VOLUMES
 # -------------------------------------------------------------