From e87d01f8b8c188c5ec6375ef765a01391d1fa26d Mon Sep 17 00:00:00 2001 From: langchain-infra Date: Mon, 27 Jan 2025 13:51:56 -0500 Subject: [PATCH] fix: support specifying a secret key for each secret vlue (#208) * fix: support specifying a secret key for each secret vlue * fix: support specifying a secret key for each secret vlue --- charts/langsmith/Chart.yaml | 2 +- charts/langsmith/README.md | 18 +++++++++++++++++- charts/langsmith/templates/_helpers.tpl | 18 +++++++++--------- charts/langsmith/values.yaml | 9 +++++++++ 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/charts/langsmith/Chart.yaml b/charts/langsmith/Chart.yaml index 92e023d..3dc7852 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.9.1 +version: 0.9.2 appVersion: "0.9.7" diff --git a/charts/langsmith/README.md b/charts/langsmith/README.md index 55b83ef..670f21b 100644 --- a/charts/langsmith/README.md +++ b/charts/langsmith/README.md @@ -1,6 +1,6 @@ # langsmith -![Version: 0.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.7](https://img.shields.io/badge/AppVersion-0.9.7-informational?style=flat-square) +![Version: 0.9.2](https://img.shields.io/badge/Version-0.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.7](https://img.shields.io/badge/AppVersion-0.9.7-informational?style=flat-square) Helm chart to deploy the langsmith application and all services it depends on. @@ -88,15 +88,22 @@ For information on how to use this chart, up-to-date release notes, and other gu | clickhouse.containerNativePort | int | `9000` | | | clickhouse.external.cluster | string | `""` | | | clickhouse.external.database | string | `"default"` | | +| clickhouse.external.databaseSecretKey | string | `"clickhouse_db"` | | | clickhouse.external.enabled | bool | `false` | | | clickhouse.external.existingSecretName | string | `""` | | | clickhouse.external.host | string | `""` | | +| clickhouse.external.hostSecretKey | string | `"clickhouse_host"` | | | clickhouse.external.hybrid | bool | `false` | Must be set to true if using managed ClickHouse | | clickhouse.external.nativePort | string | `"9000"` | | +| clickhouse.external.nativePortSecretKey | string | `"clickhouse_native_port"` | | | clickhouse.external.password | string | `"password"` | | +| clickhouse.external.passwordSecretKey | string | `"clickhouse_password"` | | | clickhouse.external.port | string | `"8123"` | | +| clickhouse.external.portSecretKey | string | `"clickhouse_port"` | | | clickhouse.external.tls | bool | `false` | | +| clickhouse.external.tlsSecretKey | string | `"clickhouse_tls"` | | | clickhouse.external.user | string | `"default"` | | +| clickhouse.external.userSecretKey | string | `"clickhouse_user"` | | | clickhouse.name | string | `"clickhouse"` | | | clickhouse.service.annotations | object | `{}` | | | clickhouse.service.httpPort | int | `8123` | | @@ -355,15 +362,22 @@ For information on how to use this chart, up-to-date release notes, and other gu | clickhouse.containerNativePort | int | `9000` | | | clickhouse.external.cluster | string | `""` | | | clickhouse.external.database | string | `"default"` | | +| clickhouse.external.databaseSecretKey | string | `"clickhouse_db"` | | | clickhouse.external.enabled | bool | `false` | | | clickhouse.external.existingSecretName | string | `""` | | | clickhouse.external.host | string | `""` | | +| clickhouse.external.hostSecretKey | string | `"clickhouse_host"` | | | clickhouse.external.hybrid | bool | `false` | Must be set to true if using managed ClickHouse | | clickhouse.external.nativePort | string | `"9000"` | | +| clickhouse.external.nativePortSecretKey | string | `"clickhouse_native_port"` | | | clickhouse.external.password | string | `"password"` | | +| clickhouse.external.passwordSecretKey | string | `"clickhouse_password"` | | | clickhouse.external.port | string | `"8123"` | | +| clickhouse.external.portSecretKey | string | `"clickhouse_port"` | | | clickhouse.external.tls | bool | `false` | | +| clickhouse.external.tlsSecretKey | string | `"clickhouse_tls"` | | | clickhouse.external.user | string | `"default"` | | +| clickhouse.external.userSecretKey | string | `"clickhouse_user"` | | | clickhouse.name | string | `"clickhouse"` | | | clickhouse.service.annotations | object | `{}` | | | clickhouse.service.httpPort | int | `8123` | | @@ -616,6 +630,7 @@ For information on how to use this chart, up-to-date release notes, and other gu |-----|------|---------|-------------| | postgres.containerPort | int | `5432` | | | postgres.external.connectionUrl | string | `""` | | +| postgres.external.connectionUrlSecretKey | string | `"connection_url"` | | | postgres.external.database | string | `"postgres"` | | | postgres.external.enabled | bool | `false` | | | postgres.external.existingSecretName | string | `""` | | @@ -737,6 +752,7 @@ For information on how to use this chart, up-to-date release notes, and other gu |-----|------|---------|-------------| | redis.containerPort | int | `6379` | | | redis.external.connectionUrl | string | `""` | | +| redis.external.connectionUrlSecretKey | string | `"connection_url"` | | | redis.external.enabled | bool | `false` | | | redis.external.existingSecretName | string | `""` | | | redis.name | string | `"redis"` | | diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl index c91e8b7..18dab0b 100644 --- a/charts/langsmith/templates/_helpers.tpl +++ b/charts/langsmith/templates/_helpers.tpl @@ -151,7 +151,7 @@ Template containing common environment variables that are used by several servic valueFrom: secretKeyRef: name: {{ include "langsmith.postgresSecretsName" . }} - key: connection_url + key: {{ .Values.postgres.external.connectionUrlSecretKey }} {{- if .Values.postgres.external.enabled }} - name: POSTGRES_SCHEMA value: {{ .Values.postgres.external.schema }} @@ -164,44 +164,44 @@ Template containing common environment variables that are used by several servic valueFrom: secretKeyRef: name: {{ include "langsmith.redisSecretsName" . }} - key: connection_url + key: {{ .Values.redis.external.connectionUrlSecretKey }} - name: CLICKHOUSE_HYBRID value: {{ .Values.clickhouse.external.hybrid | quote }} - name: CLICKHOUSE_DB valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_db + key: {{ .Values.clickhouse.external.databaseSecretKey }} - name: CLICKHOUSE_HOST valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_host + key: {{ .Values.clickhouse.external.hostSecretKey }} - name: CLICKHOUSE_PORT valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_port + key: {{ .Values.clickhouse.external.portSecretKey }} - name: CLICKHOUSE_NATIVE_PORT valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_native_port + key: {{ .Values.clickhouse.external.nativePortSecretKey }} - name: CLICKHOUSE_USER valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_user + key: {{ .Values.clickhouse.external.userSecretKey }} - name: CLICKHOUSE_PASSWORD valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_password + key: {{ .Values.clickhouse.external.passwordSecretKey }} - name: CLICKHOUSE_TLS valueFrom: secretKeyRef: name: {{ include "langsmith.clickhouseSecretsName" . }} - key: clickhouse_tls + key: {{ .Values.clickhouse.external.tlsSecretKey }} - name: CLICKHOUSE_CLUSTER value: {{ .Values.clickhouse.external.cluster }} - name: LOG_LEVEL diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml index 9dcddd5..5aa314d 100644 --- a/charts/langsmith/values.yaml +++ b/charts/langsmith/values.yaml @@ -409,12 +409,19 @@ clickhouse: # -- Must be set to true if using managed ClickHouse hybrid: false host: "" + hostSecretKey: "clickhouse_host" port: "8123" + portSecretKey: "clickhouse_port" nativePort: "9000" + nativePortSecretKey: "clickhouse_native_port" user: "default" + userSecretKey: "clickhouse_user" password: "password" + passwordSecretKey: "clickhouse_password" database: "default" + databaseSecretKey: "clickhouse_db" tls: false + tlsSecretKey: "clickhouse_tls" cluster: "" existingSecretName: "" containerHttpPort: 8123 @@ -741,6 +748,7 @@ postgres: # If connection string is specified, we will ignore all above values and use the connection string instead. # Do not include the driver name(something like "postgres://" in the connection string. connectionUrl: "" + connectionUrlSecretKey: "connection_url" existingSecretName: "" containerPort: 5432 statefulSet: @@ -888,6 +896,7 @@ redis: # creation of a redis stateful-set and service. enabled: false connectionUrl: "" + connectionUrlSecretKey: "connection_url" existingSecretName: "" containerPort: 6379 statefulSet: