[ENH] add image tags to db migration jobs (chroma-core#2425)

Anush008 · Jun 27, 2024 · 12aeebe · 12aeebe
1 parent d720544
commit 12aeebe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Tiltfile b/Tiltfile
@@ -131,10 +131,11 @@ k8s_resource(
 
 # Production Chroma
 k8s_resource('postgres', resource_deps=['k8s_setup', 'namespace'], labels=["infrastructure"], port_forwards='5432:5432')
-k8s_resource('sysdb-migration', resource_deps=['postgres', 'namespace'], labels=["infrastructure"])
-k8s_resource('logservice-migration', resource_deps=['postgres', 'namespace'], labels=["infrastructure"])
-k8s_resource('logservice', resource_deps=['sysdb-migration'], labels=["chroma"], port_forwards='50052:50051')
-k8s_resource('sysdb', resource_deps=['sysdb-migration'], labels=["chroma"], port_forwards='50051:50051')
+# Jobs are suffixed with the image tag to ensure they are unique. In this context, the image tag is defined in k8s/distributed-chroma/values.yaml.
+k8s_resource('sysdb-migration-sysdb-migration', resource_deps=['postgres', 'namespace'], labels=["infrastructure"])
+k8s_resource('logservice-migration-logservice-migration', resource_deps=['postgres', 'namespace'], labels=["infrastructure"])
+k8s_resource('logservice', resource_deps=['sysdb-migration-sysdb-migration'], labels=["chroma"], port_forwards='50052:50051')
+k8s_resource('sysdb', resource_deps=['sysdb-migration-sysdb-migration'], labels=["chroma"], port_forwards='50051:50051')
 k8s_resource('frontend-service', resource_deps=['sysdb', 'logservice'],labels=["chroma"], port_forwards='8000:8000')
 k8s_resource('query-service', resource_deps=['sysdb'], labels=["chroma"], port_forwards='50053:50051')
 k8s_resource('compaction-service', resource_deps=['sysdb'], labels=["chroma"])

diff --git a/k8s/distributed-chroma/Chart.yaml b/k8s/distributed-chroma/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v2
 name: distributed-chroma
 description: A helm chart for distributed Chroma
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "0.4.23"
 keywords:
   - chroma

diff --git a/k8s/distributed-chroma/templates/log-migration.yaml b/k8s/distributed-chroma/templates/log-migration.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: logservice-migration
+  name: logservice-migration-{{ .Values.logServiceMigration.image.tag }}
   namespace: {{ .Values.namespace }}
   annotations:
   {{ range .Values.sysdbMigration.annotations }}

diff --git a/k8s/distributed-chroma/templates/sysdb-migration.yaml b/k8s/distributed-chroma/templates/sysdb-migration.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: sysdb-migration
+  name: sysdb-migration-{{ .Values.sysdbMigration.image.tag }}
   namespace: {{ .Values.namespace }}
   annotations:
   {{ range .Values.sysdbMigration.annotations }}