From 78e3d539c630c612209191ade57ab3570cca6ddb Mon Sep 17 00:00:00 2001
From: infra <mukil@langchain.dev>
Date: Mon, 25 Nov 2024 13:41:44 -0500
Subject: [PATCH] fix: make job name randomization optional

---
 charts/langsmith/Chart.yaml                                 | 2 +-
 charts/langsmith/README.md                                  | 5 ++++-
 charts/langsmith/templates/backend/auth-bootstrap.yaml      | 2 +-
 .../langsmith/templates/backend/clickhouse-migrations.yaml  | 2 +-
 charts/langsmith/templates/backend/postgres-migrations.yaml | 2 +-
 charts/langsmith/values.yaml                                | 6 ++++++
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/charts/langsmith/Chart.yaml b/charts/langsmith/Chart.yaml
index d151925..978d09b 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.13
+version: 0.8.14
 appVersion: "0.8.38"
diff --git a/charts/langsmith/README.md b/charts/langsmith/README.md
index 3e2fd3e..ba3734e 100644
--- a/charts/langsmith/README.md
+++ b/charts/langsmith/README.md
@@ -1,6 +1,6 @@
 # langsmith
 
-![Version: 0.8.13](https://img.shields.io/badge/Version-0.8.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.38](https://img.shields.io/badge/AppVersion-0.8.38-informational?style=flat-square)
+![Version: 0.8.14](https://img.shields.io/badge/Version-0.8.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.38](https://img.shields.io/badge/AppVersion-0.8.38-informational?style=flat-square)
 
 Helm chart to deploy the langsmith application and all services it depends on.
 
@@ -225,6 +225,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | backend.authBootstrap.labels | object | `{}` |  |
 | backend.authBootstrap.nodeSelector | object | `{}` |  |
 | backend.authBootstrap.podSecurityContext | object | `{}` |  |
+| backend.authBootstrap.randomizeName | bool | `true` |  |
 | backend.authBootstrap.resources | object | `{}` |  |
 | backend.authBootstrap.securityContext | object | `{}` |  |
 | backend.authBootstrap.sidecars | list | `[]` |  |
@@ -249,6 +250,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | backend.clickhouseMigrations.labels | object | `{}` |  |
 | backend.clickhouseMigrations.nodeSelector | object | `{}` |  |
 | backend.clickhouseMigrations.podSecurityContext | object | `{}` |  |
+| backend.clickhouseMigrations.randomizeName | bool | `true` |  |
 | backend.clickhouseMigrations.resources | object | `{}` |  |
 | backend.clickhouseMigrations.securityContext | object | `{}` |  |
 | backend.clickhouseMigrations.sidecars | list | `[]` |  |
@@ -317,6 +319,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | backend.migrations.labels | object | `{}` |  |
 | backend.migrations.nodeSelector | object | `{}` |  |
 | backend.migrations.podSecurityContext | object | `{}` |  |
+| backend.migrations.randomizeName | bool | `true` |  |
 | backend.migrations.resources | object | `{}` |  |
 | backend.migrations.securityContext | object | `{}` |  |
 | backend.migrations.sidecars | list | `[]` |  |
diff --git a/charts/langsmith/templates/backend/auth-bootstrap.yaml b/charts/langsmith/templates/backend/auth-bootstrap.yaml
index c308184..7d02117 100644
--- a/charts/langsmith/templates/backend/auth-bootstrap.yaml
+++ b/charts/langsmith/templates/backend/auth-bootstrap.yaml
@@ -13,7 +13,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }}-auth-bootstrap-{{ randAlphaNum 5 | lower}}
+  name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }}-auth-bootstrap{{ ternary (printf "-%s" (randAlphaNum 5 | lower)) ""  .Values.backend.authBootstrap.randomizeName }}
   labels:
     {{- include "langsmith.labels" . | nindent 4 }}
     {{- with.Values.backend.authBootstrap.labels }}
diff --git a/charts/langsmith/templates/backend/clickhouse-migrations.yaml b/charts/langsmith/templates/backend/clickhouse-migrations.yaml
index 431cd12..de7f196 100644
--- a/charts/langsmith/templates/backend/clickhouse-migrations.yaml
+++ b/charts/langsmith/templates/backend/clickhouse-migrations.yaml
@@ -4,7 +4,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }}-ch-migrations-{{ randAlphaNum 5 | lower}}
+  name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }}-ch-migrations{{ ternary (printf "-%s" (randAlphaNum 5 | lower)) ""  .Values.backend.clickhouseMigrations.randomizeName }}
   labels:
     {{- include "langsmith.labels" . | nindent 4 }}
     {{- with.Values.backend.clickhouseMigrations.labels }}
diff --git a/charts/langsmith/templates/backend/postgres-migrations.yaml b/charts/langsmith/templates/backend/postgres-migrations.yaml
index 27b78a7..03f2b70 100644
--- a/charts/langsmith/templates/backend/postgres-migrations.yaml
+++ b/charts/langsmith/templates/backend/postgres-migrations.yaml
@@ -4,7 +4,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }}-pg-migrations-{{ randAlphaNum 5 | lower}}
+  name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }}-migrations{{ ternary (printf "-%s" (randAlphaNum 5 | lower)) ""  .Values.backend.migrations.randomizeName }}
   labels:
     {{- include "langsmith.labels" . | nindent 4 }}
     {{- with.Values.backend.migrations.labels }}
diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml
index 784b06d..5e8dfd5 100644
--- a/charts/langsmith/values.yaml
+++ b/charts/langsmith/values.yaml
@@ -281,6 +281,8 @@ backend:
     volumeMounts: []
   migrations:
     enabled: true
+    # Helpful when running using helm template to avoid the job name conflict
+    randomizeName: true
     labels: {}
     annotations: {}
     podSecurityContext: {}
@@ -308,6 +310,8 @@ backend:
     # You can set this to null to disable the TTL for the migrations job. Useful for some deployment setups.
     ttlSecondsAfterFinished: 600
   authBootstrap:
+    # Helpful when running using helm template to avoid the job name conflict
+    randomizeName: true
     labels: {}
     annotations: {}
     podSecurityContext: {}
@@ -335,6 +339,8 @@ backend:
     ttlSecondsAfterFinished: 600
   clickhouseMigrations:
     enabled: true
+    # Helpful when running using helm template to avoid the job name conflict
+    randomizeName: true
     labels: {}
     annotations: {}
     podSecurityContext: {}