feat: default service image tags to AppVersion

Author: mo-getter

helm/fiftyone-teams-app/README.md

@@ -1046,7 +1046,7 @@ If pods show unhealthy states (e.g., `0/1`, `CrashLoopBackOff`, `Pending`):
 | serviceOrchestrator.builtinServices.configMap.create | bool | `true` | Controls whether to create the `ConfigMap` named `serviceOrchestrator.builtinServices.configMap.name`. |
 | serviceOrchestrator.builtinServices.configMap.labels | object | `{}` | Additional labels for the generated `ConfigMap`. [Reference][labels-and-selectors]. |
 | serviceOrchestrator.builtinServices.configMap.name | string | `""` | Name of the `ConfigMap` (existing or to be created) in the namespace `namespace.name` holding the builtin services overrides. Defaults to `release-name-fiftyone-teams-app-builtin-services`. |
-| serviceOrchestrator.builtinServices.services | list | `[]` | Builtin service overrides, deep-merged by `id` onto the defaults packaged in fiftyone (`builtin_version` must be bumped for a changed entry to re-apply to an environment that already stores the builtin). |
+| serviceOrchestrator.builtinServices.services | list | `[]` | Builtin service overrides, deep-merged by `id` onto the defaults packaged in fiftyone (`builtin_version` must be bumped for a changed entry to re-apply to an environment that already stores the builtin). An `entrypoint.container.image` without a tag defaults to the chart's appVersion. |
 | serviceOrchestrator.enabled | bool | `false` | Controls whether to create the builtin services overrides `ConfigMap` below and wire it into `teams-api`. |
 | teamsAppSettings.affinity | object | `{}` | Affinity and anti-affinity for `teams-app`.  [Reference][affinity]. |
 | teamsAppSettings.autoscaling.enabled | bool | `false` | Controls horizontal pod autoscaling for `teams-app`.  [Reference][autoscaling]. |

helm/fiftyone-teams-app/templates/service-orchestrator-builtin-services-configmap.yaml

@@ -16,7 +16,22 @@ metadata:
   {{- end }}
   labels:
     {{- include "service-orchestrator.builtin-services-config-map-labels" . | nindent 4 }}
+{{- /* An entrypoint.container.image without a tag defaults to the chart's
+       appVersion, so entries track image bumps instead of pinning a tag —
+       same convention as the chart's other images. Tag detection looks at
+       the segment after the last "/" so a registry port
+       (registry:5000/image) is not mistaken for a tag, and digests
+       (image@sha256:...) are left alone. */}}
+{{- $services := list }}
+{{- range $service := (.Values.serviceOrchestrator.builtinServices.services | default list) }}
+{{- $service = deepCopy $service }}
+{{- $image := dig "entrypoint" "container" "image" "" $service }}
+{{- if and $image (not (contains ":" (last (splitList "/" $image)))) }}
+{{- $_ := set $service.entrypoint.container "image" (printf "%s:%s" $image $.Chart.AppVersion) }}
+{{- end }}
+{{- $services = append $services $service }}
+{{- end }}
 data:
   builtin_services.yaml: |
-    {{- toYaml (.Values.serviceOrchestrator.builtinServices.services | default list) | nindent 4 }}
+    {{- toYaml $services | nindent 4 }}
 {{- end }}

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

@@ -3501,7 +3501,7 @@
               "type": "object"
             },
             "services": {
-              "description": "Builtin service overrides, deep-merged by `id` onto the defaults\npackaged in fiftyone (`builtin_version` must be bumped for a changed\nentry to re-apply to an environment that already stores the builtin).",
+              "description": "Builtin service overrides, deep-merged by `id` onto the defaults\npackaged in fiftyone (`builtin_version` must be bumped for a changed\nentry to re-apply to an environment that already stores the builtin).\nAn `entrypoint.container.image` without a tag defaults to the chart's\nappVersion.",
               "items": {
                 "required": []
               },

helm/fiftyone-teams-app/values.yaml

@@ -1433,6 +1433,8 @@ serviceOrchestrator:
     # -- Builtin service overrides, deep-merged by `id` onto the defaults
     # packaged in fiftyone (`builtin_version` must be bumped for a changed
     # entry to re-apply to an environment that already stores the builtin).
+    # An `entrypoint.container.image` without a tag defaults to the chart's
+    # appVersion.
     services: []
 
 # FiftyOne Enterprise App (teams-app) configurations

tests/unit/helm/service-orchestrator-builtin-services-configmap_test.go

@@ -156,6 +156,47 @@ func (s *builtinServicesConfigMapTemplateTest) TestServicesPayload() {
 				s.Equal("registry:5000/sam2-video:tag", container["image"])
 			},
 		},
+		{
+			// An entrypoint image without a tag defaults to the chart's
+			// appVersion; a registry port is not mistaken for a tag and
+			// digest-pinned images are left alone.
+			"enabledWithImageTagDefaulting",
+			map[string]string{
+				"serviceOrchestrator.enabled": "true",
+			},
+			map[string]string{
+				"serviceOrchestrator.builtinServices.services": `[
+          {
+            "id": "builtin:untagged",
+            "builtin_version": 1,
+            "entrypoint": {"container": {"image": "registry:5000/sam2-video"}}
+          },
+          {
+            "id": "builtin:digest",
+            "builtin_version": 1,
+            "entrypoint": {"container": {"image": "registry:5000/sam2-video@sha256:abc123"}}
+          }
+        ]`,
+			},
+			2,
+			func(services []map[string]interface{}) {
+				cInfo, err := chartInfo(s.T(), s.chartPath)
+				s.NoError(err)
+				appVersion, exists := cInfo["appVersion"]
+				s.True(exists)
+
+				entrypoint := services[0]["entrypoint"].(map[string]interface{})
+				container := entrypoint["container"].(map[string]interface{})
+				s.Equal(
+					fmt.Sprintf("registry:5000/sam2-video:%s", appVersion),
+					container["image"],
+				)
+
+				entrypoint = services[1]["entrypoint"].(map[string]interface{})
+				container = entrypoint["container"].(map[string]interface{})
+				s.Equal("registry:5000/sam2-video@sha256:abc123", container["image"])
+			},
+		},
 	}
 
 	for _, testCase := range testCases {