From 822a003dcc32e4ffdb558fd1d884ac0e462e3784 Mon Sep 17 00:00:00 2001
From: Brian Vander Schaaf <brian@langchain.dev>
Date: Thu, 14 Nov 2024 16:03:05 -0500
Subject: [PATCH 1/6] fix: override options for hybrid deployments

---
 charts/langsmith/README.md              | 9 ++++++---
 charts/langsmith/templates/_helpers.tpl | 4 ++--
 charts/langsmith/values.yaml            | 4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/charts/langsmith/README.md b/charts/langsmith/README.md
index c593843..113aa45 100644
--- a/charts/langsmith/README.md
+++ b/charts/langsmith/README.md
@@ -1,6 +1,6 @@
 # langsmith
 
-![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.31](https://img.shields.io/badge/AppVersion-0.8.31-informational?style=flat-square)
+![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.32](https://img.shields.io/badge/AppVersion-0.8.32-informational?style=flat-square)
 
 Helm chart to deploy the langsmith application and all services it depends on.
 
@@ -85,6 +85,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.config.allowSimdjson | bool | `true` |  |
 | clickhouse.containerHttpPort | int | `8123` |  |
 | clickhouse.containerNativePort | int | `9000` |  |
+| clickhouse.external.clickhouseCluster | string | `""` |  |
 | clickhouse.external.database | string | `"default"` |  |
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
@@ -191,11 +192,12 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | config.basicAuth.initialOrgAdminEmail | string | `""` |  |
 | config.basicAuth.initialOrgAdminPassword | string | `""` |  |
 | config.basicAuth.jwtSecret | string | `""` |  |
-| config.blobStorage | object | `{"accessKey":"","accessKeySecret":"","apiURL":"https://s3.us-west-2.amazonaws.com","azureStorageAccountKey":"","azureStorageAccountName":"","azureStorageConnectionString":"","azureStorageContainerName":"","azureStorageServiceUrlOverride":"","bucketName":"","chSearchEnabled":true,"enabled":false,"engine":"S3","minBlobStorageSizeKb":"20"}` | Blob storage configuration Optional. Used to store inputs, outputs, and errors in Blob Storage. We currently support S3, GCS, Minio, and Azure as Blob Storage providers. |
+| config.blobStorage | object | `{"accessKey":"","accessKeySecret":"","apiURL":"https://s3.us-west-2.amazonaws.com","azureStorageAccountKey":"","azureStorageAccountName":"","azureStorageConnectionString":"","azureStorageContainerName":"","azureStorageServiceUrlOverride":"","bucketName":"","chSearchEnabled":true,"enabled":false,"engine":"S3","hosting":"self-hosted","minBlobStorageSizeKb":"20"}` | Blob storage configuration Optional. Used to store inputs, outputs, and errors in Blob Storage. We currently support S3, GCS, Minio, and Azure as Blob Storage providers. |
 | config.blobStorage.azureStorageAccountName | string | `""` | Optional. Set this along with azureStorageAccountKey to use a storage account and access key. Higher precedence than azureStorageConnectionString. |
 | config.blobStorage.azureStorageConnectionString | string | `""` | Optional. Use this to specify the full connection string including any authentication params. |
 | config.blobStorage.azureStorageContainerName | string | `""` | Required if using Azure blob storage |
 | config.blobStorage.azureStorageServiceUrlOverride | string | `""` | Optional. Use this to customize the service URL, which by default is 'https://<storage_account_name>.blob.core.windows.net/' |
+| config.blobStorage.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | config.existingSecretName | string | `""` |  |
 | config.hostname | string | `""` | Base URL of the LangSmith installation. Used for redirects. |
 | config.langsmithLicenseKey | string | `""` |  |
@@ -342,6 +344,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.config.allowSimdjson | bool | `true` |  |
 | clickhouse.containerHttpPort | int | `8123` |  |
 | clickhouse.containerNativePort | int | `9000` |  |
+| clickhouse.external.clickhouseCluster | string | `""` |  |
 | clickhouse.external.database | string | `"default"` |  |
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
@@ -780,6 +783,6 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | Ankush | <ankush@langchain.dev> |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
+Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
 ## Docs Generated by [helm-docs](https://github.com/norwoodj/helm-docs)
 `helm-docs -t ./charts/langsmith/README.md.gotmpl`
diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl
index 839a77f..86cdc9c 100644
--- a/charts/langsmith/templates/_helpers.tpl
+++ b/charts/langsmith/templates/_helpers.tpl
@@ -279,7 +279,7 @@ Template containing common environment variables that are used by several servic
 - name: BLOB_STORAGE_ENGINE
   value: {{ .Values.config.blobStorage.engine | quote }}
 - name: MIN_BLOB_STORAGE_SIZE_KB
-  value: {{ .Values.config.blobStorage.minBlobStorageSizeKb | quote }}
+  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
 {{- if eq .Values.config.blobStorage.engine "S3" }}
 - name: S3_BUCKET_NAME
   value: {{ .Values.config.blobStorage.bucketName | quote }}
@@ -322,7 +322,7 @@ Template containing common environment variables that are used by several servic
 {{- end }}
 {{- end }}
 - name: FF_CH_SEARCH_ENABLED
-  value: {{ .Values.config.blobStorage.chSearchEnabled | quote }}
+  value: {{ ternary 0 .Values.config.blobStorage.chSearchEnabled (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
 {{ include "langsmith.conditionalEnvVarsResolved" . }}
 {{- end }}
 
diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml
index 33aead7..423ce59 100644
--- a/charts/langsmith/values.yaml
+++ b/charts/langsmith/values.yaml
@@ -111,10 +111,14 @@ config:
   blobStorage:
     enabled: false
     engine: "S3"
+    # -- Either "self-hosted" or "hybrid"
+    hosting: "self-hosted"
     # If you are using langsmith-managed-clickhouse, you may not want inputs to be stored in clickhouse for search.
     # Set this as false to ensure that inputs/outputs/errors are not stored in clickhouse.
+    # hosting: "hybrid" overrides this to false.
     chSearchEnabled: true
     # Set this to change the threshold for payloads to be stored in blob storage
+    # hosting: "hybrid" overrides this to 0
     minBlobStorageSizeKb: "20"
     # If you are using workload identity, you may not need to store the S3 credentials in the secrets.
     # Instead, you will need to add the workload identity annotation to the backend and queue service accounts.

From 2039824a059682b95fb505d7c5b7cf1e142450ea Mon Sep 17 00:00:00 2001
From: Brian Vander Schaaf <brian@langchain.dev>
Date: Thu, 14 Nov 2024 16:31:11 -0500
Subject: [PATCH 2/6] example

---
 .../examples/blob_storage_config.yaml         | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/charts/langsmith/examples/blob_storage_config.yaml b/charts/langsmith/examples/blob_storage_config.yaml
index c793d01..2a0825e 100644
--- a/charts/langsmith/examples/blob_storage_config.yaml
+++ b/charts/langsmith/examples/blob_storage_config.yaml
@@ -3,14 +3,25 @@ config:
   apiKeySalt: "YOUR_API_KEY_SALT"
   blobStorage:
     enabled: true
+    # Set engine: "Azure" if using Azure blob storage
+    engine: "S3"
+    # Set hosting: "hybrid" if using managed ClickHouse
+    hosting: "self-hosted"
+
+    # S3-specific
     bucketName: "langsmith-s3-assets"
     apiUrl: "https://s3.us-west-2.amazonaws.com"
-    # Optional: If you are using IRSA(only for EKS), you can specify the service account annotations instead of an access key and secret.
+    # Optional: If you are using IRSA (only for EKS), you can specify the service account annotations instead of an access key and secret.
     # These can also be specified in your existingSecretName.
     accessKey: "YOUR_ACCESS_KEY"
     accessKeySecret: "YOUR_ACCESS_KEY_SECRET"
 
-# If using IRSA(only for EKS), you can specify the service account annotations here.
+    # Azure-specific
+    azureStorageAccountName: "your-storage-account-name"  # If constructing a service URL like https://<storage_account_name>.blob.core.windows.net/
+    azureStorageServiceUrlOverride: "https://your.service.override.net" # If constructing a service URL of a different format
+    azureStorageContainerName: "your-container"
+
+# If using IRSA (only for EKS), you can specify the service account annotations here.
 #backend:
 #  serviceAccount:
 #    annotations:
@@ -21,3 +32,27 @@ config:
 #    annotations:
 #      eks.amazonaws.com/role-arn: "arn:aws:iam::640174622193:role/langsmith-s3-admin-role"
 
+# If using workload identity on AKS, specify the required deployment label and service account annotation
+#backend:
+#  deployment:
+#    labels:
+#      azure.workload.identity/use: "true"
+#  serviceAccount:
+#    annotations:
+#      azure.workload.identity/client-id: "managed-identity-client-id"
+#
+#platformBackend:
+#  deployment:
+#    labels:
+#      azure.workload.identity/use: "true"
+#  serviceAccount:
+#    annotations:
+#      azure.workload.identity/client-id: "managed-identity-client-id"
+#
+#queue:
+#  deployment:
+#    labels:
+#      azure.workload.identity/use: "true"
+#  serviceAccount:
+#    annotations:
+#      azure.workload.identity/client-id: "managed-identity-client-id"

From 227cadeb5ed93a1510bdaebff538141dc868c9f4 Mon Sep 17 00:00:00 2001
From: Brian Vander Schaaf <brian@langchain.dev>
Date: Thu, 14 Nov 2024 16:34:35 -0500
Subject: [PATCH 3/6] version bump

---
 charts/langsmith/Chart.yaml | 2 +-
 charts/langsmith/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/langsmith/Chart.yaml b/charts/langsmith/Chart.yaml
index 123b4a6..0e9defc 100644
--- a/charts/langsmith/Chart.yaml
+++ b/charts/langsmith/Chart.yaml
@@ -5,5 +5,5 @@ maintainers:
     email: ankush@langchain.dev
 description: Helm chart to deploy the langsmith application and all services it depends on.
 type: application
-version: 0.8.10
+version: 0.8.11
 appVersion: "0.8.32"
diff --git a/charts/langsmith/README.md b/charts/langsmith/README.md
index 113aa45..934c867 100644
--- a/charts/langsmith/README.md
+++ b/charts/langsmith/README.md
@@ -1,6 +1,6 @@
 # langsmith
 
-![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.32](https://img.shields.io/badge/AppVersion-0.8.32-informational?style=flat-square)
+![Version: 0.8.11](https://img.shields.io/badge/Version-0.8.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.32](https://img.shields.io/badge/AppVersion-0.8.32-informational?style=flat-square)
 
 Helm chart to deploy the langsmith application and all services it depends on.
 

From 6bc490a9315feedb771b4db8bcbc605d4645b97c Mon Sep 17 00:00:00 2001
From: Brian Vander Schaaf <brian@langchain.dev>
Date: Thu, 14 Nov 2024 16:43:26 -0500
Subject: [PATCH 4/6] fix

---
 charts/langsmith/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl
index 86cdc9c..24287b8 100644
--- a/charts/langsmith/templates/_helpers.tpl
+++ b/charts/langsmith/templates/_helpers.tpl
@@ -322,7 +322,7 @@ Template containing common environment variables that are used by several servic
 {{- end }}
 {{- end }}
 - name: FF_CH_SEARCH_ENABLED
-  value: {{ ternary 0 .Values.config.blobStorage.chSearchEnabled (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
+  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
 {{ include "langsmith.conditionalEnvVarsResolved" . }}
 {{- end }}
 

From 9982d50fe552e77986da4973b72d5ba74b2fd2b9 Mon Sep 17 00:00:00 2001
From: Brian Vander Schaaf <brian@langchain.dev>
Date: Thu, 14 Nov 2024 17:08:07 -0500
Subject: [PATCH 5/6] update

---
 charts/langsmith/README.md                         | 5 +++--
 charts/langsmith/examples/blob_storage_config.yaml | 8 ++++++--
 charts/langsmith/templates/_helpers.tpl            | 4 ++--
 charts/langsmith/values.yaml                       | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/charts/langsmith/README.md b/charts/langsmith/README.md
index 934c867..9b396b4 100644
--- a/charts/langsmith/README.md
+++ b/charts/langsmith/README.md
@@ -90,6 +90,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
 | clickhouse.external.host | string | `""` |  |
+| clickhouse.external.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | clickhouse.external.nativePort | string | `"9000"` |  |
 | clickhouse.external.password | string | `"password"` |  |
 | clickhouse.external.port | string | `"8123"` |  |
@@ -192,12 +193,11 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | config.basicAuth.initialOrgAdminEmail | string | `""` |  |
 | config.basicAuth.initialOrgAdminPassword | string | `""` |  |
 | config.basicAuth.jwtSecret | string | `""` |  |
-| config.blobStorage | object | `{"accessKey":"","accessKeySecret":"","apiURL":"https://s3.us-west-2.amazonaws.com","azureStorageAccountKey":"","azureStorageAccountName":"","azureStorageConnectionString":"","azureStorageContainerName":"","azureStorageServiceUrlOverride":"","bucketName":"","chSearchEnabled":true,"enabled":false,"engine":"S3","hosting":"self-hosted","minBlobStorageSizeKb":"20"}` | Blob storage configuration Optional. Used to store inputs, outputs, and errors in Blob Storage. We currently support S3, GCS, Minio, and Azure as Blob Storage providers. |
+| config.blobStorage | object | `{"accessKey":"","accessKeySecret":"","apiURL":"https://s3.us-west-2.amazonaws.com","azureStorageAccountKey":"","azureStorageAccountName":"","azureStorageConnectionString":"","azureStorageContainerName":"","azureStorageServiceUrlOverride":"","bucketName":"","chSearchEnabled":true,"enabled":false,"engine":"S3","minBlobStorageSizeKb":"20"}` | Blob storage configuration Optional. Used to store inputs, outputs, and errors in Blob Storage. We currently support S3, GCS, Minio, and Azure as Blob Storage providers. |
 | config.blobStorage.azureStorageAccountName | string | `""` | Optional. Set this along with azureStorageAccountKey to use a storage account and access key. Higher precedence than azureStorageConnectionString. |
 | config.blobStorage.azureStorageConnectionString | string | `""` | Optional. Use this to specify the full connection string including any authentication params. |
 | config.blobStorage.azureStorageContainerName | string | `""` | Required if using Azure blob storage |
 | config.blobStorage.azureStorageServiceUrlOverride | string | `""` | Optional. Use this to customize the service URL, which by default is 'https://<storage_account_name>.blob.core.windows.net/' |
-| config.blobStorage.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | config.existingSecretName | string | `""` |  |
 | config.hostname | string | `""` | Base URL of the LangSmith installation. Used for redirects. |
 | config.langsmithLicenseKey | string | `""` |  |
@@ -349,6 +349,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
 | clickhouse.external.host | string | `""` |  |
+| clickhouse.external.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | clickhouse.external.nativePort | string | `"9000"` |  |
 | clickhouse.external.password | string | `"password"` |  |
 | clickhouse.external.port | string | `"8123"` |  |
diff --git a/charts/langsmith/examples/blob_storage_config.yaml b/charts/langsmith/examples/blob_storage_config.yaml
index 2a0825e..03cf952 100644
--- a/charts/langsmith/examples/blob_storage_config.yaml
+++ b/charts/langsmith/examples/blob_storage_config.yaml
@@ -5,8 +5,6 @@ config:
     enabled: true
     # Set engine: "Azure" if using Azure blob storage
     engine: "S3"
-    # Set hosting: "hybrid" if using managed ClickHouse
-    hosting: "self-hosted"
 
     # S3-specific
     bucketName: "langsmith-s3-assets"
@@ -21,6 +19,12 @@ config:
     azureStorageServiceUrlOverride: "https://your.service.override.net" # If constructing a service URL of a different format
     azureStorageContainerName: "your-container"
 
+clickhouse:
+  external:
+    enabled: true
+    # Set hosting: "hybrid" if using managed ClickHouse
+    hosting: "self-hosted"
+
 # If using IRSA (only for EKS), you can specify the service account annotations here.
 #backend:
 #  serviceAccount:
diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl
index 24287b8..64468e0 100644
--- a/charts/langsmith/templates/_helpers.tpl
+++ b/charts/langsmith/templates/_helpers.tpl
@@ -279,7 +279,7 @@ Template containing common environment variables that are used by several servic
 - name: BLOB_STORAGE_ENGINE
   value: {{ .Values.config.blobStorage.engine | quote }}
 - name: MIN_BLOB_STORAGE_SIZE_KB
-  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
+  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb (eq .Values.clickhouse.external.hosting "hybrid") | quote }}
 {{- if eq .Values.config.blobStorage.engine "S3" }}
 - name: S3_BUCKET_NAME
   value: {{ .Values.config.blobStorage.bucketName | quote }}
@@ -322,7 +322,7 @@ Template containing common environment variables that are used by several servic
 {{- end }}
 {{- end }}
 - name: FF_CH_SEARCH_ENABLED
-  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
+  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled (eq .Values.clickhouse.external.hosting "hybrid") | quote }}
 {{ include "langsmith.conditionalEnvVarsResolved" . }}
 {{- end }}
 
diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml
index 423ce59..4dbbc24 100644
--- a/charts/langsmith/values.yaml
+++ b/charts/langsmith/values.yaml
@@ -111,8 +111,6 @@ config:
   blobStorage:
     enabled: false
     engine: "S3"
-    # -- Either "self-hosted" or "hybrid"
-    hosting: "self-hosted"
     # If you are using langsmith-managed-clickhouse, you may not want inputs to be stored in clickhouse for search.
     # Set this as false to ensure that inputs/outputs/errors are not stored in clickhouse.
     # hosting: "hybrid" overrides this to false.
@@ -392,6 +390,8 @@ clickhouse:
     # If enabled, use the following values to connect to an external database. This will also disable the
     # creation of a clickhouse stateful-set and service.
     enabled: false
+    # -- Either "self-hosted" or "hybrid"
+    hosting: "self-hosted"
     host: ""
     port: "8123"
     nativePort: "9000"

From e75ba7c612dfa6754caaf14c0417c8ca3b7ddae1 Mon Sep 17 00:00:00 2001
From: Brian Vander Schaaf <brian@langchain.dev>
Date: Thu, 14 Nov 2024 17:14:00 -0500
Subject: [PATCH 6/6] fupdate

---
 charts/langsmith/README.md                         | 4 ++--
 charts/langsmith/examples/blob_storage_config.yaml | 4 ++--
 charts/langsmith/templates/_helpers.tpl            | 4 ++--
 charts/langsmith/values.yaml                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/langsmith/README.md b/charts/langsmith/README.md
index 9b396b4..2bb4aa8 100644
--- a/charts/langsmith/README.md
+++ b/charts/langsmith/README.md
@@ -90,7 +90,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
 | clickhouse.external.host | string | `""` |  |
-| clickhouse.external.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
+| clickhouse.external.hybrid | bool | `false` | Set to true if using managed ClickHouse |
 | clickhouse.external.nativePort | string | `"9000"` |  |
 | clickhouse.external.password | string | `"password"` |  |
 | clickhouse.external.port | string | `"8123"` |  |
@@ -349,7 +349,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
 | clickhouse.external.host | string | `""` |  |
-| clickhouse.external.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
+| clickhouse.external.hybrid | bool | `false` | Set to true if using managed ClickHouse |
 | clickhouse.external.nativePort | string | `"9000"` |  |
 | clickhouse.external.password | string | `"password"` |  |
 | clickhouse.external.port | string | `"8123"` |  |
diff --git a/charts/langsmith/examples/blob_storage_config.yaml b/charts/langsmith/examples/blob_storage_config.yaml
index 03cf952..b5d9484 100644
--- a/charts/langsmith/examples/blob_storage_config.yaml
+++ b/charts/langsmith/examples/blob_storage_config.yaml
@@ -22,8 +22,8 @@ config:
 clickhouse:
   external:
     enabled: true
-    # Set hosting: "hybrid" if using managed ClickHouse
-    hosting: "self-hosted"
+    # Set hybrid: true if using managed ClickHouse
+    hybrid: false
 
 # If using IRSA (only for EKS), you can specify the service account annotations here.
 #backend:
diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl
index 64468e0..e9e2a2d 100644
--- a/charts/langsmith/templates/_helpers.tpl
+++ b/charts/langsmith/templates/_helpers.tpl
@@ -279,7 +279,7 @@ Template containing common environment variables that are used by several servic
 - name: BLOB_STORAGE_ENGINE
   value: {{ .Values.config.blobStorage.engine | quote }}
 - name: MIN_BLOB_STORAGE_SIZE_KB
-  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb (eq .Values.clickhouse.external.hosting "hybrid") | quote }}
+  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb .Values.clickhouse.external.hybrid | quote }}
 {{- if eq .Values.config.blobStorage.engine "S3" }}
 - name: S3_BUCKET_NAME
   value: {{ .Values.config.blobStorage.bucketName | quote }}
@@ -322,7 +322,7 @@ Template containing common environment variables that are used by several servic
 {{- end }}
 {{- end }}
 - name: FF_CH_SEARCH_ENABLED
-  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled (eq .Values.clickhouse.external.hosting "hybrid") | quote }}
+  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled .Values.clickhouse.external.hybrid | quote }}
 {{ include "langsmith.conditionalEnvVarsResolved" . }}
 {{- end }}
 
diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml
index 4dbbc24..3bad93d 100644
--- a/charts/langsmith/values.yaml
+++ b/charts/langsmith/values.yaml
@@ -390,8 +390,8 @@ clickhouse:
     # If enabled, use the following values to connect to an external database. This will also disable the
     # creation of a clickhouse stateful-set and service.
     enabled: false
-    # -- Either "self-hosted" or "hybrid"
-    hosting: "self-hosted"
+    # -- Set to true if using managed ClickHouse
+    hybrid: false
     host: ""
     port: "8123"
     nativePort: "9000"