Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

fix(chart): distinct Redis nameOverride vs gateway Redis (#713)

Ajayi Dipo70471bed6f4c
diff --git a/charts/trueforge/README.md b/charts/trueforge/README.md
index ae41c775b..c9721851e 100644
--- a/charts/trueforge/README.md
+++ b/charts/trueforge/README.md
@@ -226,6 +226,10 @@ externalRedis:
key: redis-url
```
+`redis.nameOverride` defaults to `trueforge-redis` so bundled Redis objects do
+not share names with other Redis chart dependencies when this chart is a
+dependency of some other chart.
+
For passworded Redis, prefer an external instance and load `REDIS_URL` via
`valueFrom`.
@@ -328,6 +332,7 @@ extraObjects:
| `configs.oidc.enabled`| `false` | Inject `OIDC_*` env for IdP login. |
| `postgresql.enabled` | `true` | Bundle the Bitnami Postgres subchart. |
| `redis.enabled` | `true` | Bundle the Bitnami Redis subchart. |
+| `redis.nameOverride` | `trueforge-redis` | Bitnami name prefix for bundled Redis objects. |
| `service.type` | `ClusterIP` | Service type. |
| `service.port` | `8790` | Service port. |
| `server.port` | `8790` | Container port (`PORT`). |
diff --git a/charts/trueforge/templates/_helpers.tpl b/charts/trueforge/templates/_helpers.tpl
index 030d7a248..5e79e2332 100644
--- a/charts/trueforge/templates/_helpers.tpl
+++ b/charts/trueforge/templates/_helpers.tpl
@@ -190,8 +190,26 @@ postgresql subchart (existingSecret override or <release>-postgresql).
{{- default (printf "%s-postgresql" .Release.Name) .Values.postgresql.auth.existingSecret -}}
{{- end }}
+{{/*
+Bitnami redis fullname (mirrors common.names.fullname) so REDIS_URL tracks
+redis.nameOverride / redis.fullnameOverride.
+*/}}
+{{- define "trueforge.redis.fullname" -}}
+{{- if .Values.redis.fullnameOverride -}}
+{{- .Values.redis.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default "redis" .Values.redis.nameOverride -}}
+{{- $releaseName := regexReplaceAll "(-?[^a-z\\d\\-])+-?" (lower .Release.Name) "-" -}}
+{{- if contains $name $releaseName -}}
+{{- $releaseName | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" $releaseName $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end }}
+
{{- define "trueforge.redis.bundledUrl" -}}
-{{- printf "redis://%s-redis-master:6379" .Release.Name -}}
+{{- printf "redis://%s-master:6379" (include "trueforge.redis.fullname" .) -}}
{{- end }}
{{/*
diff --git a/charts/trueforge/values.yaml b/charts/trueforge/values.yaml
index d85b11849..c0330eb7f 100644
--- a/charts/trueforge/values.yaml
+++ b/charts/trueforge/values.yaml
@@ -203,6 +203,7 @@ postgresql:
redis:
enabled: true
architecture: standalone
+ nameOverride: trueforge-redis
# The redis 24.0.0 subchart floats `latest`; pin a legacy tag mirrored to JFrog
# for reproducibility (bitnamilegacy has no 8.4.x, so we track 8.2.x here).
image: