diff --git a/charts/langfuse/README.md b/charts/langfuse/README.md index d1704c68..c3f6a7be 100644 --- a/charts/langfuse/README.md +++ b/charts/langfuse/README.md @@ -188,6 +188,7 @@ Open source LLM engineering platform - LLM observability, metrics, evaluations, | langfuse.worker.vpa.minAllowed | object | `{}` | The minimum allowed resources for the langfuse worker pods | | langfuse.worker.vpa.updatePolicy.updateMode | string | `"Auto"` | The update policy mode for the langfuse worker pods | | nameOverride | string | `""` | Override the name for the selector labels, defaults to the chart name | +| namespaceOverride | string | `""` | Override the namespace for all deployed resources, defaults to the release namespace | | postgresql.architecture | string | `"standalone"` | | | postgresql.args | string | `""` | Additional database connection arguments | | postgresql.auth.args | string | `""` | Additional database connection arguments | diff --git a/charts/langfuse/templates/_helpers.tpl b/charts/langfuse/templates/_helpers.tpl index 413a1108..d2c2349b 100644 --- a/charts/langfuse/templates/_helpers.tpl +++ b/charts/langfuse/templates/_helpers.tpl @@ -50,6 +50,17 @@ app.kubernetes.io/name: {{ include "langfuse.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} +{{/* +Return the namespace to use +*/}} +{{- define "langfuse.namespace" -}} +{{- if .Values.namespaceOverride }} +{{- .Values.namespaceOverride }} +{{- else }} +{{- .Release.Namespace }} +{{- end }} +{{- end }} + {{/* Create the name of the service account to use */}} diff --git a/charts/langfuse/templates/ingress.yaml b/charts/langfuse/templates/ingress.yaml index 0eeac4e3..1650e4d1 100644 --- a/charts/langfuse/templates/ingress.yaml +++ b/charts/langfuse/templates/ingress.yaml @@ -14,7 +14,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ include "langfuse.fullname" . }} - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} {{- with .Values.langfuse.ingress.additionalLabels }} diff --git a/charts/langfuse/templates/nextauth-secret.yaml b/charts/langfuse/templates/nextauth-secret.yaml index 7224425b..97f3c233 100644 --- a/charts/langfuse/templates/nextauth-secret.yaml +++ b/charts/langfuse/templates/nextauth-secret.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "langfuse.fullname" . }}-nextauth - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} data: diff --git a/charts/langfuse/templates/postgresql-secret.yaml b/charts/langfuse/templates/postgresql-secret.yaml index 50f70c9f..2ad80f8d 100644 --- a/charts/langfuse/templates/postgresql-secret.yaml +++ b/charts/langfuse/templates/postgresql-secret.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "langfuse.fullname" . }}-postgresql - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} type: Opaque diff --git a/charts/langfuse/templates/serviceaccount.yaml b/charts/langfuse/templates/serviceaccount.yaml index 0ce7360d..a73697ab 100644 --- a/charts/langfuse/templates/serviceaccount.yaml +++ b/charts/langfuse/templates/serviceaccount.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "langfuse.serviceAccountName" . }} - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} {{- with .Values.langfuse.serviceAccount.annotations }} diff --git a/charts/langfuse/templates/web/deployment.yaml b/charts/langfuse/templates/web/deployment.yaml index 03ab56dc..79f4ea6a 100644 --- a/charts/langfuse/templates/web/deployment.yaml +++ b/charts/langfuse/templates/web/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "langfuse.fullname" . }}-web - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} {{- with .Values.langfuse.web.deployment.additionalLabels }} diff --git a/charts/langfuse/templates/web/hpa.yaml b/charts/langfuse/templates/web/hpa.yaml index d5585616..77166a4c 100644 --- a/charts/langfuse/templates/web/hpa.yaml +++ b/charts/langfuse/templates/web/hpa.yaml @@ -3,7 +3,7 @@ apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "langfuse.fullname" . }}-web - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} spec: diff --git a/charts/langfuse/templates/web/scaled-object.yaml b/charts/langfuse/templates/web/scaled-object.yaml index 9a43323c..c2e97238 100644 --- a/charts/langfuse/templates/web/scaled-object.yaml +++ b/charts/langfuse/templates/web/scaled-object.yaml @@ -3,7 +3,7 @@ apiVersion: keda.sh/v1alpha1 kind: ScaledObject metadata: name: {{ include "langfuse.fullname" . }}-web - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} spec: diff --git a/charts/langfuse/templates/web/service.yaml b/charts/langfuse/templates/web/service.yaml index 966b55e9..6d7c2c09 100644 --- a/charts/langfuse/templates/web/service.yaml +++ b/charts/langfuse/templates/web/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "langfuse.fullname" . }}-web - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} {{- with .Values.langfuse.web.service.additionalLabels }} diff --git a/charts/langfuse/templates/web/vpa.yaml b/charts/langfuse/templates/web/vpa.yaml index 6b945c7f..e9426e66 100644 --- a/charts/langfuse/templates/web/vpa.yaml +++ b/charts/langfuse/templates/web/vpa.yaml @@ -3,7 +3,7 @@ apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: name: {{ include "langfuse.fullname" . }}-web - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} spec: diff --git a/charts/langfuse/templates/worker/deployment.yaml b/charts/langfuse/templates/worker/deployment.yaml index ef66ff2e..45655d21 100644 --- a/charts/langfuse/templates/worker/deployment.yaml +++ b/charts/langfuse/templates/worker/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "langfuse.fullname" . }}-worker - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} {{- with .Values.langfuse.worker.deployment.additionalLabels }} diff --git a/charts/langfuse/templates/worker/hpa.yaml b/charts/langfuse/templates/worker/hpa.yaml index 6ee6d474..5f584a18 100644 --- a/charts/langfuse/templates/worker/hpa.yaml +++ b/charts/langfuse/templates/worker/hpa.yaml @@ -3,7 +3,7 @@ apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "langfuse.fullname" . }}-worker - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} spec: diff --git a/charts/langfuse/templates/worker/scaled-object.yaml b/charts/langfuse/templates/worker/scaled-object.yaml index c5662476..31a4e19c 100644 --- a/charts/langfuse/templates/worker/scaled-object.yaml +++ b/charts/langfuse/templates/worker/scaled-object.yaml @@ -3,7 +3,7 @@ apiVersion: keda.sh/v1alpha1 kind: ScaledObject metadata: name: {{ include "langfuse.fullname" . }}-worker - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} spec: diff --git a/charts/langfuse/templates/worker/vpa.yaml b/charts/langfuse/templates/worker/vpa.yaml index 8abf5806..9675729e 100644 --- a/charts/langfuse/templates/worker/vpa.yaml +++ b/charts/langfuse/templates/worker/vpa.yaml @@ -3,7 +3,7 @@ apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: name: {{ include "langfuse.fullname" . }}-worker - namespace: {{ $.Release.Namespace }} + namespace: {{ include "langfuse.namespace" . }} labels: {{- include "langfuse.labels" . | nindent 4 }} spec: diff --git a/charts/langfuse/values.yaml b/charts/langfuse/values.yaml index b4050e7b..52ace6ca 100644 --- a/charts/langfuse/values.yaml +++ b/charts/langfuse/values.yaml @@ -11,6 +11,9 @@ nameOverride: "" # -- Override the full name of the deployed resources, defaults to a combination of the release name and the name for the selector labels fullnameOverride: "" +# -- Override the namespace for all deployed resources, defaults to the release namespace +namespaceOverride: "" + # Core Langfuse Configuration langfuse: # Logging configuration