fix: propagate forcePathStyle correctly through helm chart (#96)

langfuse · Mar 7, 2025 · ec85946 · ec85946
1 parent a338af3
commit ec85946
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,9 @@ The required configuration options to set are:
   #  langfuse:
   #    encryptionKey:
   #      value: ""
+  langfuse: 
+    salt:
+      value: secureSalt
 
   nextauth:
     secret:
@@ -66,12 +69,17 @@ The required configuration options to set are:
 They can alternatively set via secret references (the secrets must exist):
 
 ```yaml
-    # Optional, but highly recommended. Generate via `openssl rand -hex 32`.
-    #  langfuse:
-    #    encryptionKey:
-    #      secretKeyRef:
-    #        name: langfuse-encryption-key-secret
-    #        key: encryptionKey
+  # Optional, but highly recommended. Generate via `openssl rand -hex 32`.
+  #  langfuse:
+  #    encryptionKey:
+  #      secretKeyRef:
+  #        name: langfuse-encryption-key-secret
+  #        key: encryptionKey
+  langfuse: 
+    salt:
+      secretKeyRef:
+        name: langfuse-general
+        key: salt
 
   nextauth:
     secret:
@@ -117,6 +125,28 @@ postgresql:
   shadowDatabaseUrl: postgres://my-username:[email protected]
 ```
 
+#### With an external S3 bucket
+
+```yaml
+[...]
+s3:
+  deploy: false
+  bucket: "langfuse-bucket"
+  region: "eu-west-1"
+  endpoint: "https://s3.eu-west-1.amazonaws.com"
+  forcePathStyle: false
+  accessKeyId:
+    value: "mykey"
+  secretAccessKey:
+    value: "mysecret"
+  eventUpload:
+    prefix: "events/"
+  batchExport:
+    prefix: "exports/"
+  mediaUpload:
+    prefix: "media/"
+```
+
 ##### Enable ingress
 
 ```yaml

diff --git a/charts/langfuse/Chart.yaml b/charts/langfuse/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: langfuse
-version: 1.0.0-rc.9
+version: 1.0.0-rc.10
 description: Open source LLM engineering platform - LLM observability, metrics, evaluations, prompt management.
 type: application
 keywords:

diff --git a/charts/langfuse/README.md b/charts/langfuse/README.md
@@ -1,6 +1,6 @@
 # langfuse
 
-![Version: 1.0.0-rc.9](https://img.shields.io/badge/Version-1.0.0--rc.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.29.1](https://img.shields.io/badge/AppVersion-3.29.1-informational?style=flat-square)
+![Version: 1.0.0-rc.10](https://img.shields.io/badge/Version-1.0.0--rc.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.29.1](https://img.shields.io/badge/AppVersion-3.29.1-informational?style=flat-square)
 
 Open source LLM engineering platform - LLM observability, metrics, evaluations, prompt management.
 
@@ -184,7 +184,7 @@ Open source LLM engineering platform - LLM observability, metrics, evaluations,
 | s3.batchExport.bucket | string | `""` | S3 bucket to use for batch exports. |
 | s3.batchExport.enabled | bool | `true` | Enable batch export. |
 | s3.batchExport.endpoint | string | `""` | S3 endpoint to use for batch exports. |
-| s3.batchExport.forcePathStyle | bool | `true` | Whether to force path style on requests. Required for MinIO. |
+| s3.batchExport.forcePathStyle | string | `nil` | Whether to force path style on requests. Required for MinIO. |
 | s3.batchExport.prefix | string | `""` | Prefix to use for batch exports within the bucket. |
 | s3.batchExport.region | string | `""` | S3 region to use for batch exports. |
 | s3.batchExport.secretAccessKey | object | `{"secretKeyRef":{"key":"","name":""},"value":""}` | S3 secretAccessKey to use for batch exports. |
@@ -197,7 +197,7 @@ Open source LLM engineering platform - LLM observability, metrics, evaluations,
 | s3.eventUpload.accessKeyId | object | `{"secretKeyRef":{"key":"","name":""},"value":""}` | S3 accessKeyId to use for event uploads. |
 | s3.eventUpload.bucket | string | `""` | S3 bucket to use for event uploads. |
 | s3.eventUpload.endpoint | string | `""` | S3 endpoint to use for event uploads. |
-| s3.eventUpload.forcePathStyle | bool | `true` | Whether to force path style on requests. Required for MinIO. |
+| s3.eventUpload.forcePathStyle | string | `nil` | Whether to force path style on requests. Required for MinIO. |
 | s3.eventUpload.prefix | string | `""` | Prefix to use for event uploads within the bucket. |
 | s3.eventUpload.region | string | `""` | S3 region to use for event uploads. |
 | s3.eventUpload.secretAccessKey | object | `{"secretKeyRef":{"key":"","name":""},"value":""}` | S3 secretAccessKey to use for event uploads. |
@@ -207,7 +207,7 @@ Open source LLM engineering platform - LLM observability, metrics, evaluations,
 | s3.mediaUpload.downloadUrlExpirySeconds | int | `3600` | Expiry time for download URLs. Defaults to 1 hour. |
 | s3.mediaUpload.enabled | bool | `true` | Enable media uploads. |
 | s3.mediaUpload.endpoint | string | `""` | S3 endpoint to use for media uploads. |
-| s3.mediaUpload.forcePathStyle | bool | `true` | Whether to force path style on requests. Required for MinIO. |
+| s3.mediaUpload.forcePathStyle | string | `nil` | Whether to force path style on requests. Required for MinIO. |
 | s3.mediaUpload.maxContentLength | int | `1000000000` | Maximum content length for media uploads. Defaults to 1GB. |
 | s3.mediaUpload.prefix | string | `""` | Prefix to use for media uploads within the bucket. |
 | s3.mediaUpload.region | string | `""` | S3 region to use for media uploads. |

diff --git a/charts/langfuse/templates/_helpers.tpl b/charts/langfuse/templates/_helpers.tpl
@@ -360,7 +360,7 @@ Get value of a specific environment variable from additionalEnv if it exists
   value: {{ .Values.s3.auth.rootPassword | quote }}
 {{- end }}
 {{- end }}
-{{- if or .Values.s3.eventUpload.forcePathStyle .Values.s3.forcePathStyle }}
+{{- if or (hasKey .Values.s3.eventUpload "forcePathStyle") (hasKey .Values.s3 "forcePathStyle") }}
 - name: LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE
   value: {{ .Values.s3.eventUpload.forcePathStyle | default .Values.s3.forcePathStyle | quote }}
 {{- end }}
@@ -403,7 +403,7 @@ Get value of a specific environment variable from additionalEnv if it exists
   value: {{ .Values.s3.auth.rootPassword | quote }}
 {{- end }}
 {{- end }}
-{{- if or .Values.s3.batchExport.forcePathStyle .Values.s3.forcePathStyle }}
+{{- if or (hasKey .Values.s3.batchExport "forcePathStyle") (hasKey .Values.s3 "forcePathStyle") }}
 - name: LANGFUSE_S3_BATCH_EXPORT_FORCE_PATH_STYLE
   value: {{ .Values.s3.batchExport.forcePathStyle | default .Values.s3.forcePathStyle | quote }}
 {{- end }}
@@ -444,7 +444,7 @@ Get value of a specific environment variable from additionalEnv if it exists
   value: {{ .Values.s3.auth.rootPassword | quote }}
 {{- end }}
 {{- end }}
-{{- if or .Values.s3.mediaUpload.forcePathStyle .Values.s3.forcePathStyle }}
+{{- if or (hasKey .Values.s3.mediaUpload "forcePathStyle") (hasKey .Values.s3 "forcePathStyle") }}
 - name: LANGFUSE_S3_MEDIA_UPLOAD_FORCE_PATH_STYLE
   value: {{ .Values.s3.mediaUpload.forcePathStyle | default .Values.s3.forcePathStyle | quote }}
 {{- end }}

diff --git a/charts/langfuse/values.yaml b/charts/langfuse/values.yaml
@@ -458,7 +458,7 @@ s3:
     # -- S3 endpoint to use for event uploads.
     endpoint: ""
     # -- Whether to force path style on requests. Required for MinIO.
-    forcePathStyle: true
+    forcePathStyle: Null
     # -- S3 accessKeyId to use for event uploads.
     accessKeyId:
       value: ""
@@ -485,7 +485,7 @@ s3:
     # -- S3 endpoint to use for batch exports.
     endpoint: ""
     # -- Whether to force path style on requests. Required for MinIO.
-    forcePathStyle: true
+    forcePathStyle: Null
     # -- S3 accessKeyId to use for batch exports.
     accessKeyId:
       value: ""
@@ -512,7 +512,7 @@ s3:
     # -- S3 endpoint to use for media uploads.
     endpoint: ""
     # -- Whether to force path style on requests. Required for MinIO.
-    forcePathStyle: true
+    forcePathStyle: Null
     # -- S3 accessKeyId to use for media uploads.
     accessKeyId:
       value: ""