fix: auto-inject sidecar settings

Author: kaixi-wang

helm/fiftyone-teams-app/README.md

@@ -943,7 +943,7 @@ If pods show unhealthy states (e.g., `0/1`, `CrashLoopBackOff`, `Pending`):
 | delegatedOperatorJobTemplates.template.image.tag | string | `""` | Image tag for `delegated-operator-executor`. Defaults to the chart version. |
 | delegatedOperatorJobTemplates.template.jobAnnotations | object | `{}` | Annotations for the `teams-do` deployment. [Reference][annotations]. |
 | delegatedOperatorJobTemplates.template.labels | object | `{}` | Additional labels for the `delegated-operator-executor` related objects. [Reference][labels-and-selectors]. |
-| delegatedOperatorJobTemplates.template.nativeSidecarContainers | list | `[]` | Native sidecar containers for on-demand delegated-operator Job pods (Kubernetes 1.29+). Entries are rendered under `initContainers`; set `restartPolicy: Always` on each entry to enable the native sidecar lifecycle. Kubelet auto-terminates these when the executor container finishes, so the Job completes cleanly. [Reference][sidecar-containers]. |
+| delegatedOperatorJobTemplates.template.nativeSidecarContainers | list | `[]` | Native sidecar containers for on-demand delegated-operator Job pods (Kubernetes 1.29+). Entries are rendered under `initContainers`; set `restartPolicy: Always` on each entry to enable the native sidecar lifecycle. Kubelet auto-terminates these when the executor container finishes, so the Job completes cleanly. The chart auto-injects `TARGET_CONTAINER=executor` on each entry (override by setting it explicitly). [Reference][sidecar-containers]. |
 | delegatedOperatorJobTemplates.template.nodeSelector | object | `{}` | nodeSelector for `delegated-operator-executor`. [Reference][node-selector]. |
 | delegatedOperatorJobTemplates.template.podAnnotations | object | `{}` | Annotations for delegated-operator-executor pods. [Reference][annotations]. |
 | delegatedOperatorJobTemplates.template.podSecurityContext | object | `{}` | Pod-level security attributes and common container settings for `delegated-operator-executor`. [Reference][security-context]. |

helm/fiftyone-teams-app/templates/delegated-operator-job-configmap.yaml

@@ -44,6 +44,31 @@ data:
   {{- $mergedVolumes := $jobConfig.volumes | default $baseTpl.volumes }}
   {{- $mergedExtraContainers := $jobConfig.extraContainers | default $baseTpl.extraContainers }}
   {{- $mergedNativeSidecarContainers := $jobConfig.nativeSidecarContainers | default $baseTpl.nativeSidecarContainers }}
+
+  {{- /* telemetry-sidecar needs a shared emptyDir; values can't reliably keep it through fleet regenerators, so reconcile it here. */ -}}
+  {{- $needsTelemetrySocket := false }}
+  {{- range $sidecar := $mergedNativeSidecarContainers }}
+    {{- range $vm := ($sidecar.volumeMounts | default list) }}
+      {{- if eq $vm.name "telemetry-socket" }}{{- $needsTelemetrySocket = true }}{{- end }}
+    {{- end }}
+  {{- end }}
+  {{- if $needsTelemetrySocket }}
+    {{- $hasVolume := false }}
+    {{- range $v := ($mergedVolumes | default list) }}
+      {{- if eq $v.name "telemetry-socket" }}{{- $hasVolume = true }}{{- end }}
+    {{- end }}
+    {{- if not $hasVolume }}
+      {{- $mergedVolumes = append ($mergedVolumes | default list) (dict "name" "telemetry-socket" "emptyDir" dict) }}
+    {{- end }}
+    {{- $hasMount := false }}
+    {{- range $vm := ($mergedVolumeMounts | default list) }}
+      {{- if eq $vm.name "telemetry-socket" }}{{- $hasMount = true }}{{- end }}
+    {{- end }}
+    {{- if not $hasMount }}
+      {{- $mergedVolumeMounts = append ($mergedVolumeMounts | default list) (dict "name" "telemetry-socket" "mountPath" "/tmp/telemetry") }}
+    {{- end }}
+  {{- end }}
+
   {{- /* Trunc at 48 for the random ID to be generated via API */ -}}
   {{- $metadataName := kebabcase $jobName | trunc 48 }}
 
@@ -129,7 +154,20 @@ data:
             {{- end }}
           {{- with $mergedNativeSidecarContainers }}
           initContainers:
-            {{- toYaml . | nindent 12 }}
+            {{- /* TARGET_CONTAINER tells the telemetry sidecar's log tailer which container to follow; the executor is hardcoded so we know the value. */ -}}
+            {{- range $sidecar := . }}
+            {{- $hasTargetContainer := false }}
+            {{- range $env := ($sidecar.env | default list) }}
+              {{- if eq $env.name "TARGET_CONTAINER" }}
+                {{- $hasTargetContainer = true }}
+              {{- end }}
+            {{- end }}
+            {{- $rendered := deepCopy $sidecar }}
+            {{- if not $hasTargetContainer }}
+              {{- $_ := set $rendered "env" (prepend ($sidecar.env | default list) (dict "name" "TARGET_CONTAINER" "value" "executor")) }}
+            {{- end }}
+            {{- list $rendered | toYaml | nindent 12 }}
+            {{- end }}
           {{- end }}
           {{- with $mergedNodeSelector }}
           nodeSelector:

helm/fiftyone-teams-app/values.schema.json

@@ -2489,7 +2489,7 @@
               "type": "object"
             },
             "nativeSidecarContainers": {
-              "description": "Native sidecar containers for on-demand delegated-operator Job pods\n(Kubernetes 1.29+). Entries are rendered under `initContainers`; set\n`restartPolicy: Always` on each entry to enable the native sidecar\nlifecycle. Kubelet auto-terminates these when the executor container\nfinishes, so the Job completes cleanly. [Reference][sidecar-containers].",
+              "description": "Native sidecar containers for on-demand delegated-operator Job pods\n(Kubernetes 1.29+). Entries are rendered under `initContainers`; set\n`restartPolicy: Always` on each entry to enable the native sidecar\nlifecycle. Kubelet auto-terminates these when the executor container\nfinishes, so the Job completes cleanly. The chart auto-injects\n`TARGET_CONTAINER=executor` on each entry (override by setting it\nexplicitly). [Reference][sidecar-containers].",
               "items": {
                 "required": []
               },

helm/fiftyone-teams-app/values.yaml

@@ -1031,7 +1031,9 @@ delegatedOperatorJobTemplates:
     # (Kubernetes 1.29+). Entries are rendered under `initContainers`; set
     # `restartPolicy: Always` on each entry to enable the native sidecar
     # lifecycle. Kubelet auto-terminates these when the executor container
-    # finishes, so the Job completes cleanly. [Reference][sidecar-containers].
+    # finishes, so the Job completes cleanly. The chart auto-injects
+    # `TARGET_CONTAINER=executor` on each entry (override by setting it
+    # explicitly). [Reference][sidecar-containers].
     nativeSidecarContainers: []
   # -- On-Demand Delegated Operator Jobs.
   jobs: {}