ci: refactor scout sidecar (#7338)

* ci: remove stray comma in settings_local.py

* ci: move scout sidecar to containers

initContainers sidecars not supported until kubernetes 1.29

helm/settings_local.py

@@ -182,7 +182,7 @@ if _SCOUT_KEY is not None:
     SCOUT_CORE_AGENT_SOCKET_PATH = "tcp://{host}:{port}".format(
         host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "localhost"),
         port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "6590"),
-    ),
+    )
     SCOUT_CORE_AGENT_DOWNLOAD = False
     SCOUT_CORE_AGENT_LAUNCH = False
     SCOUT_REVISION_SHA = __release_hash__[:7]

helm/templates/deployments/datatracker.yaml

@@ -27,6 +27,17 @@ spec:
       securityContext:
         {{- toYaml $podValues.podSecurityContext | nindent 8 }}
       containers:
+        {{- if $podValues.scoutapm }}
+        - name: "scoutapm"
+          image: "{{ $podValues.scoutapm.image.repository }}:{{ default "latest" $podValues.scoutapm.image.tag }}"
+          imagePullPolicy: {{ default "IfNotPresent" $podValues.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 }}
@@ -57,13 +68,6 @@ spec:
             {{- toYaml $podValues.startupProbe | nindent 12 }}
           resources:
             {{- toYaml $podValues.resources | nindent 12 }}
-      {{- if $podValues.scoutapm }}
-      initContainers:
-        - name: "scoutapm"
-          image: "{{ $podValues.scoutapm.image.repository }}:{{ default "latest" $podValues.image.tag }}"
-          imagePullPolicy: {{ default "IfNotPresent" $podValues.scoutapm.image.imagePullPolicy }}
-          restartPolicy: "Always"
-      {{- end }}
       {{- with $podValues.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}