diff --git a/charts/pca-ai-serving/charts/pca-observability/Chart.lock b/charts/pca-ai-serving/charts/pca-observability/Chart.lock index 6f0c2e3..27b5cf9 100644 --- a/charts/pca-ai-serving/charts/pca-observability/Chart.lock +++ b/charts/pca-ai-serving/charts/pca-observability/Chart.lock @@ -2,5 +2,8 @@ dependencies: - name: langfuse repository: https://langfuse.github.io/langfuse-k8s version: 1.5.38 -digest: sha256:8f6baa06158763167e7dcd54079ea3f5810111a0023c6558117fc62d0e788c62 -generated: "2026-07-13T14:10:22.210943611+03:00" +- name: aws-compatible-storage + repository: https://rh-ai-quickstart.github.io/ai-architecture-charts + version: 0.2.0 +digest: sha256:a5128c61ef539dc2956f2e6e274f984040eb6587c8f0442735bf75892b8d7939 +generated: "2026-11-02T10:09:29.681673-05:00" diff --git a/charts/pca-ai-serving/charts/pca-observability/Chart.yaml b/charts/pca-ai-serving/charts/pca-observability/Chart.yaml index 497be4d..5ae66a7 100644 --- a/charts/pca-ai-serving/charts/pca-observability/Chart.yaml +++ b/charts/pca-ai-serving/charts/pca-observability/Chart.yaml @@ -7,3 +7,8 @@ dependencies: version: "1.5.38" repository: https://langfuse.github.io/langfuse-k8s condition: langfuse.enabled + # Object storage for Langfuse + - name: aws-compatible-storage + version: "0.2.0" + repository: https://rh-ai-quickstart.github.io/ai-architecture-charts + condition: aws-compatible-storage.enabled,langfuse.enabled diff --git a/charts/pca-ai-serving/charts/pca-observability/README.md b/charts/pca-ai-serving/charts/pca-observability/README.md index 7380fdd..c919d7c 100644 --- a/charts/pca-ai-serving/charts/pca-observability/README.md +++ b/charts/pca-ai-serving/charts/pca-observability/README.md @@ -114,4 +114,4 @@ Guardrails proxy forwards these headers. Flagged requests (input skip or output ## Persistence -Modest defaults when Langfuse is on: Postgres ~10Gi, ClickHouse ~20Gi, MinIO ~10Gi. Omit `storageClassName` (cluster default) unless `persistence.storageClass` / bitnami persistence overrides are set. Grafana is ephemeral (ConfigMap dashboards). +Modest defaults when Langfuse is on: Postgres ~10Gi, ClickHouse ~20Gi, object storage ~10Gi (`aws-compatible-storage.storage.data.size`). Omit `storageClassName` (cluster default) unless `aws-compatible-storage.storage.data.storageClass` is set. Grafana is ephemeral (ConfigMap dashboards). diff --git a/charts/pca-ai-serving/charts/pca-observability/charts/aws-compatible-storage-0.2.0.tgz b/charts/pca-ai-serving/charts/pca-observability/charts/aws-compatible-storage-0.2.0.tgz new file mode 100644 index 0000000..dafc925 Binary files /dev/null and b/charts/pca-ai-serving/charts/pca-observability/charts/aws-compatible-storage-0.2.0.tgz differ diff --git a/charts/pca-ai-serving/charts/pca-observability/templates/langfuse-secret.yaml b/charts/pca-ai-serving/charts/pca-observability/templates/langfuse-secret.yaml index a424245..b708609 100644 --- a/charts/pca-ai-serving/charts/pca-observability/templates/langfuse-secret.yaml +++ b/charts/pca-ai-serving/charts/pca-observability/templates/langfuse-secret.yaml @@ -10,7 +10,6 @@ {{- $pgPass := $creds.postgresPassword | default "" -}} {{- $redisPass := $creds.redisPassword | default "" -}} {{- $chPass := $creds.clickhousePassword | default "" -}} -{{- $s3Pass := $creds.s3RootPassword | default "" -}} {{- $userPass := $creds.initUserPassword | default "" -}} {{- $pk := $creds.initProjectPublicKey | default "" -}} {{- $sk := $creds.initProjectSecretKey | default "" -}} @@ -22,7 +21,6 @@ {{- if and (not $pgPass) (index $existing.data "postgres-password") -}}{{- $pgPass = index $existing.data "postgres-password" | b64dec -}}{{- end -}} {{- if and (not $redisPass) (index $existing.data "redis-password") -}}{{- $redisPass = index $existing.data "redis-password" | b64dec -}}{{- end -}} {{- if and (not $chPass) (index $existing.data "clickhouse-password") -}}{{- $chPass = index $existing.data "clickhouse-password" | b64dec -}}{{- end -}} - {{- if and (not $s3Pass) (index $existing.data "s3-root-password") -}}{{- $s3Pass = index $existing.data "s3-root-password" | b64dec -}}{{- end -}} {{- if and (not $userPass) (index $existing.data "init-user-password") -}}{{- $userPass = index $existing.data "init-user-password" | b64dec -}}{{- end -}} {{- if and (not $pk) (index $existing.data "init-project-public-key") -}}{{- $pk = index $existing.data "init-project-public-key" | b64dec -}}{{- end -}} {{- if and (not $sk) (index $existing.data "init-project-secret-key") -}}{{- $sk = index $existing.data "init-project-secret-key" | b64dec -}}{{- end -}} @@ -34,7 +32,6 @@ {{- if not $pgPass -}}{{- $pgPass = randAlphaNum 24 -}}{{- end -}} {{- if not $redisPass -}}{{- $redisPass = randAlphaNum 24 -}}{{- end -}} {{- if not $chPass -}}{{- $chPass = randAlphaNum 24 -}}{{- end -}} -{{- if not $s3Pass -}}{{- $s3Pass = randAlphaNum 24 -}}{{- end -}} {{- if not $userPass -}}{{- $userPass = randAlphaNum 24 -}}{{- end -}} {{- if not $pk -}}{{- $pk = printf "pk-lf-%s" (randAlphaNum 32) -}}{{- end -}} {{- if not $sk -}}{{- $sk = printf "sk-lf-%s" (randAlphaNum 32) -}}{{- end -}} @@ -57,8 +54,6 @@ stringData: postgres-password: {{ $pgPass | quote }} redis-password: {{ $redisPass | quote }} clickhouse-password: {{ $chPass | quote }} - s3-root-password: {{ $s3Pass | quote }} - s3-root-user: minio init-user-password: {{ $userPass | quote }} init-project-public-key: {{ $pk | quote }} init-project-secret-key: {{ $sk | quote }} diff --git a/charts/pca-ai-serving/charts/pca-observability/templates/object-storage-secret.yaml b/charts/pca-ai-serving/charts/pca-observability/templates/object-storage-secret.yaml new file mode 100644 index 0000000..7d7ce80 --- /dev/null +++ b/charts/pca-ai-serving/charts/pca-observability/templates/object-storage-secret.yaml @@ -0,0 +1,32 @@ +{{- if .Values.langfuse.enabled }} +{{- $ns := include "pca-observability.namespace" . -}} +{{- $secretName := "pca-langfuse-s3-credentials" -}} +{{- $existing := lookup "v1" "Secret" $ns $secretName -}} + +{{- $creds := .Values.langfuse.credentials | default dict -}} +{{- $accessKeyId := $creds.s3AccessKeyId | default "" -}} +{{- $secretAccessKey := $creds.s3RootPassword | default "" -}} + +{{- if $existing -}} + {{- if and (not $accessKeyId) (index $existing.data "AWS_ACCESS_KEY_ID") -}}{{- $accessKeyId = index $existing.data "AWS_ACCESS_KEY_ID" | b64dec -}}{{- end -}} + {{- if and (not $secretAccessKey) (index $existing.data "AWS_SECRET_ACCESS_KEY") -}}{{- $secretAccessKey = index $existing.data "AWS_SECRET_ACCESS_KEY" | b64dec -}}{{- end -}} +{{- end -}} + +{{- if not $accessKeyId -}}{{- $accessKeyId = "s4admin" -}}{{- end -}} +{{- if not $secretAccessKey -}}{{- $secretAccessKey = randAlphaNum 24 -}}{{- end -}} + +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} + namespace: {{ $ns }} + labels: + app.kubernetes.io/name: pca-langfuse-s3 + app.kubernetes.io/part-of: pca-observability + annotations: + argocd.argoproj.io/sync-wave: "-1" +type: Opaque +stringData: + AWS_ACCESS_KEY_ID: {{ $accessKeyId | quote }} + AWS_SECRET_ACCESS_KEY: {{ $secretAccessKey | quote }} +{{- end }} diff --git a/charts/pca-ai-serving/charts/pca-observability/values.yaml b/charts/pca-ai-serving/charts/pca-observability/values.yaml index fda6ebb..56923df 100644 --- a/charts/pca-ai-serving/charts/pca-observability/values.yaml +++ b/charts/pca-ai-serving/charts/pca-observability/values.yaml @@ -126,16 +126,43 @@ langfuse: size: 20Gi zookeeper: fullnameOverride: pca-langfuse-zookeeper + # Langfuse S3 client — external store (aws-compatible-storage below). + # deploy: false disables the MinIO bundled with the langfuse chart s3: - deploy: true - fullnameOverride: pca-langfuse-s3 - auth: - rootUser: minio - existingSecret: pca-langfuse-credentials - rootUserSecretKey: s3-root-user - rootPasswordSecretKey: s3-root-password - persistence: + deploy: false + bucket: langfuse + region: us-east-1 + endpoint: http://pca-langfuse-s3:7480 + forcePathStyle: true + accessKeyId: + secretKeyRef: + name: pca-langfuse-s3-credentials + key: AWS_ACCESS_KEY_ID + secretAccessKey: + secretKeyRef: + name: pca-langfuse-s3-credentials + key: AWS_SECRET_ACCESS_KEY +# Object storage for Langfuse, replacing the MinIO bundled with the langfuse chart. +aws-compatible-storage: + fullnameOverride: pca-langfuse-s3 + s3: + existingSecret: pca-langfuse-s3-credentials + region: us-east-1 + endpoint: http://localhost:7480 + auth: + enabled: false + route: + enabled: false + s3Api: + enabled: false + storage: + data: size: 10Gi + # Creates the bucket only (urls: [] → nothing uploaded). + sampleFileUpload: + enabled: true + bucket: langfuse + urls: [] otelCollector: image: otel/opentelemetry-collector-contrib:0.120.0 replicas: 1 @@ -157,4 +184,3 @@ persistence: storageClass: "" postgresSize: 10Gi clickhouseSize: 20Gi - minioSize: 10Gi