fix: telemetry-redis is not optional

Author: mo-getter

helm/fiftyone-teams-app/README.md

@@ -1094,7 +1094,6 @@ If pods show unhealthy states (e.g., `0/1`, `CrashLoopBackOff`, `Pending`):
 | teamsAppSettings.updateStrategy | object | `{"type":"RollingUpdate"}` | Control how `teams-app` pods are redeployed during an upgrade. [Reference][upgrade-strategies] |
 | teamsAppSettings.volumeMounts | list | `[]` | Volume mounts for `teams-app` pods. [Reference][volumes]. |
 | teamsAppSettings.volumes | list | `[]` | Volumes for `teams-app` pods. [Reference][volumes]. |
-| telemetry.enabled | bool | `false` | Controls whether the telemetry Redis backend is deployed and `FIFTYONE_TELEMETRY_REDIS_URL` is injected on consumer deployments. When `false`, no Redis objects are rendered and no env var is added — any sidecars defined via `extraContainers`/`nativeSidecarContainers` remain responsible for their own configuration. |
 | telemetry.redis.affinity | object | `{}` | Affinity for the telemetry Redis pod. [Reference][affinity]. |
 | telemetry.redis.containerSecurityContext | object | `{}` | Container-level security attributes for the telemetry Redis container. [Reference][container-security-context]. |
 | telemetry.redis.external.url | string | `""` | URL of an external Redis to use instead of the bundled one (e.g. `redis://my-redis.example.com:6379`). When set, the chart does not render the bundled Redis `Deployment`/`Service`/`PersistentVolumeClaim`. |

helm/fiftyone-teams-app/templates/_do_targets.tpl

@@ -50,10 +50,8 @@ Create a merged list of environment variables for delegated-operator templates
     secretKeyRef:
       name: {{ .secretName }}
       key: encryptionKey
-{{- if .telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
   value: {{ .telemetryRedisUrl | quote }}
-{{- end }}
 {{- range $key, $val := .env }}
 - name: {{ $key }}
   value: {{ $val | quote }}

helm/fiftyone-teams-app/templates/_helpers.tpl

@@ -298,16 +298,14 @@ Telemetry Redis URL
 
 Resolves the URL for the telemetry Redis backend:
 - if telemetry.redis.external.url is set, returns it (external Redis)
-- else if telemetry.enabled, returns the in-cluster Service URL
-- else returns empty string
+- else returns the in-cluster Service URL for the bundled Redis
 
-Used both by `*-deployment.yaml` env injection and to gate the bundled
-Redis templates.
+Always returns a non-empty URL — the application depends on Redis.
 */}}
 {{- define "fiftyone-teams-app.telemetryRedisUrl" -}}
 {{- if .Values.telemetry.redis.external.url -}}
 {{- .Values.telemetry.redis.external.url -}}
-{{- else if .Values.telemetry.enabled -}}
+{{- else -}}
 {{- printf "redis://%s:%v" .Values.telemetry.redis.service.name (.Values.telemetry.redis.service.port | int) -}}
 {{- end -}}
 {{- end }}
@@ -360,10 +358,8 @@ Create a merged list of environment variables for delegated-operator-executor
     secretKeyRef:
       name: {{ .secretName }}
       key: encryptionKey
-{{- if .telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
   value: {{ .telemetryRedisUrl | quote }}
-{{- end }}
 {{- range $key, $val := .env }}
 - name: {{ $key }}
   value: {{ $val | quote }}
@@ -422,11 +418,8 @@ Create a merged list of environment variables for fiftyone-teams-api
     secretKeyRef:
       name: {{ $secretName }}
       key: fiftyoneDatabaseName
-{{- $telemetryRedisUrl := include "fiftyone-teams-app.telemetryRedisUrl" . }}
-{{- if $telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
-  value: {{ $telemetryRedisUrl | quote }}
-{{- end }}
+  value: {{ include "fiftyone-teams-app.telemetryRedisUrl" . | quote }}
 {{- range $key, $val := .Values.apiSettings.env }}
 - name: {{ $key }}
   value: {{ $val | quote }}
@@ -472,11 +465,8 @@ Create a merged list of environment variables for fiftyone-app
     secretKeyRef:
       name: {{ $secretName }}
       key: encryptionKey
-{{- $telemetryRedisUrl := include "fiftyone-teams-app.telemetryRedisUrl" . }}
-{{- if $telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
-  value: {{ $telemetryRedisUrl | quote }}
-{{- end }}
+  value: {{ include "fiftyone-teams-app.telemetryRedisUrl" . | quote }}
 {{- range $key, $val := .Values.appSettings.env }}
 - name: {{ $key }}
   value: {{ $val | quote }}
@@ -546,11 +536,8 @@ Create a merged list of environment variables for fiftyone-teams-cas
     secretKeyRef:
       name: {{ $secretName }}
       key: mongodbConnectionString
-{{- $telemetryRedisUrl := include "fiftyone-teams-app.telemetryRedisUrl" . }}
-{{- if $telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
-  value: {{ $telemetryRedisUrl | quote }}
-{{- end }}
+  value: {{ include "fiftyone-teams-app.telemetryRedisUrl" . | quote }}
 {{- range $key, $val := .Values.casSettings.env }}
 - name: {{ $key }}
   value: {{ $val | quote }}
@@ -598,11 +585,8 @@ Create a merged list of environment variables for fiftyone-teams-plugins
     secretKeyRef:
       name: {{ $secretName }}
       key: encryptionKey
-{{- $telemetryRedisUrl := include "fiftyone-teams-app.telemetryRedisUrl" . }}
-{{- if $telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
-  value: {{ $telemetryRedisUrl | quote }}
-{{- end }}
+  value: {{ include "fiftyone-teams-app.telemetryRedisUrl" . | quote }}
 {{- range $key, $val := .Values.pluginsSettings.env }}
 - name: {{ $key }}
   value: {{ $val | quote }}
@@ -654,11 +638,8 @@ Create a merged list of environment variables for fiftyone-teams-app
 {{- else }}
   value: {{ printf "http://%s:%.0f" .Values.appSettings.service.name (float64 .Values.appSettings.service.port) | quote }}
 {{- end }}
-{{- $telemetryRedisUrl := include "fiftyone-teams-app.telemetryRedisUrl" . }}
-{{- if $telemetryRedisUrl }}
 - name: FIFTYONE_TELEMETRY_REDIS_URL
-  value: {{ $telemetryRedisUrl | quote }}
-{{- end }}
+  value: {{ include "fiftyone-teams-app.telemetryRedisUrl" . | quote }}
 {{- range $key, $val := .Values.teamsAppSettings.env }}
 - name: {{ $key }}
   value: {{ $val | quote }}

helm/fiftyone-teams-app/templates/telemetry-redis-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.telemetry.enabled (not .Values.telemetry.redis.external.url) }}
+{{- if not .Values.telemetry.redis.external.url }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

helm/fiftyone-teams-app/templates/telemetry-redis-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.telemetry.enabled (not .Values.telemetry.redis.external.url) .Values.telemetry.redis.persistence.enabled }}
+{{- if and (not .Values.telemetry.redis.external.url) .Values.telemetry.redis.persistence.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

helm/fiftyone-teams-app/templates/telemetry-redis-service.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.telemetry.enabled (not .Values.telemetry.redis.external.url) }}
+{{- if not .Values.telemetry.redis.external.url }}
 apiVersion: v1
 kind: Service
 metadata:

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

@@ -4010,14 +4010,8 @@
       "type": "object"
     },
     "telemetry": {
-      "description": "Telemetry sidecar feature. When enabled, the chart provisions a Redis\nbackend used by the telemetry sidecars (see `*.nativeSidecarContainers` /\n`*.extraContainers`) and auto-injects `FIFTYONE_TELEMETRY_REDIS_URL` on\n`fiftyone-app`, `teams-api`, `teams-app`, `teams-cas`, `teams-plugins`,\nand each delegated-operator deployment so the in-app `Settings → Metrics`\npage can read live samples and logs.",
+      "description": "Telemetry sidecar feature. The application depends on Redis for the\nin-app `Settings → Metrics` page (live samples and tailed logs from\n`*.nativeSidecarContainers` / `*.extraContainers`). By default the chart\nprovisions a bundled Redis backend. To use an existing/managed Redis\ninstead, set `telemetry.redis.external.url` and the chart will skip the\nbundled `Deployment`/`Service`/`PersistentVolumeClaim` and wire\n`FIFTYONE_TELEMETRY_REDIS_URL` at that URL instead. The env var is\nalways injected on `fiftyone-app`, `teams-api`, `teams-app`, `teams-cas`,\n`teams-plugins`, and each delegated-operator deployment.",
       "properties": {
-        "enabled": {
-          "default": false,
-          "description": "Controls whether the telemetry Redis backend is deployed and\n`FIFTYONE_TELEMETRY_REDIS_URL` is injected on consumer deployments.\nWhen `false`, no Redis objects are rendered and no env var is added —\nany sidecars defined via `extraContainers`/`nativeSidecarContainers`\nremain responsible for their own configuration.",
-          "title": "enabled",
-          "type": "boolean"
-        },
         "redis": {
           "properties": {
             "affinity": {

helm/fiftyone-teams-app/values.yaml

@@ -1643,19 +1643,16 @@ teamsAppSettings:
   # -- Volumes for `teams-app` pods. [Reference][volumes].
   volumes: []
 
-# Telemetry sidecar feature. When enabled, the chart provisions a Redis
-# backend used by the telemetry sidecars (see `*.nativeSidecarContainers` /
-# `*.extraContainers`) and auto-injects `FIFTYONE_TELEMETRY_REDIS_URL` on
-# `fiftyone-app`, `teams-api`, `teams-app`, `teams-cas`, `teams-plugins`,
-# and each delegated-operator deployment so the in-app `Settings → Metrics`
-# page can read live samples and logs.
+# Telemetry sidecar feature. The application depends on Redis for the
+# in-app `Settings → Metrics` page (live samples and tailed logs from
+# `*.nativeSidecarContainers` / `*.extraContainers`). By default the chart
+# provisions a bundled Redis backend. To use an existing/managed Redis
+# instead, set `telemetry.redis.external.url` and the chart will skip the
+# bundled `Deployment`/`Service`/`PersistentVolumeClaim` and wire
+# `FIFTYONE_TELEMETRY_REDIS_URL` at that URL instead. The env var is
+# always injected on `fiftyone-app`, `teams-api`, `teams-app`, `teams-cas`,
+# `teams-plugins`, and each delegated-operator deployment.
 telemetry:
-  # -- Controls whether the telemetry Redis backend is deployed and
-  # `FIFTYONE_TELEMETRY_REDIS_URL` is injected on consumer deployments.
-  # When `false`, no Redis objects are rendered and no env var is added —
-  # any sidecars defined via `extraContainers`/`nativeSidecarContainers`
-  # remain responsible for their own configuration.
-  enabled: false
   redis:
     # -- Container image for the bundled telemetry Redis.
     image: redis:7-alpine

tests/unit/helm/api-deployment_test.go

@@ -495,6 +495,10 @@ func (s *deploymentApiTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_DO_EXPIRATION_DAYS",
             "value": "1"
@@ -613,6 +617,10 @@ func (s *deploymentApiTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_DO_EXPIRATION_DAYS",
             "value": "1"
@@ -745,6 +753,10 @@ func (s *deploymentApiTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_DO_EXPIRATION_DAYS",
             "value": "1"
@@ -874,6 +886,10 @@ func (s *deploymentApiTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_DO_EXPIRATION_DAYS",
             "value": "1"
@@ -991,6 +1007,10 @@ func (s *deploymentApiTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_DO_EXPIRATION_DAYS",
             "value": "1"
@@ -1108,6 +1128,10 @@ func (s *deploymentApiTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_DO_EXPIRATION_DAYS",
             "value": "1"

tests/unit/helm/app-deployment_test.go

@@ -472,6 +472,10 @@ func (s *deploymentAppTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE",
             "value": "true"
@@ -565,6 +569,10 @@ func (s *deploymentAppTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE",
             "value": "true"
@@ -672,6 +680,10 @@ func (s *deploymentAppTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE",
             "value": "true"
@@ -776,6 +788,10 @@ func (s *deploymentAppTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE",
             "value": "true"
@@ -868,6 +884,10 @@ func (s *deploymentAppTemplateTest) TestContainerEnv() {
               }
             }
           },
+          {
+            "name": "FIFTYONE_TELEMETRY_REDIS_URL",
+            "value": "redis://telemetry-redis:6379"
+          },
           {
             "name": "FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE",
             "value": "true"