feature(trieve-helm): add additionalLabels for postgres within helm

Author: cdxker

argocd-app.yaml

@@ -10,7 +10,7 @@ spec:
     namespace: trieve
   source:
     repoURL: https://devflowinc.github.io/trieve-helm
-    targetRevision: 0.2.43
+    targetRevision: 0.2.44
     chart: trieve
     helm:
       releaseName: trieve-local
@@ -29,6 +29,8 @@ spec:
         postgres:
           # Enables Postgres via the subchart
           enabled: true
+          additionalLabels:
+            owner: gen-ai
           # Installs cloudnative-pg operator
           installCrds: true
           # Pulls from secret if postgres.enabled = true
@@ -145,6 +147,9 @@ spec:
             templates:
               podTemplates:
                 - name: clickhouse-pod-template
+                  metadata:
+                    labels:
+                      owner: gen-ai
                   spec:
                     containers:
                       - name: clickhouse

charts/trieve/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: trieve
 description: Helm chart expressing Trieve deployment without any dependencies
 type: application
-version: 0.2.44
+version: 0.2.45
 appVersion: "0.12.0"
 dependencies:
   - name: qdrant

charts/trieve/charts/postgres/templates/postgres-cluster.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ $.Release.Name }}-trieve-postgres
     app.kubernetes.io/instance: {{ .Release.Name }}
-    {{- with .Values.global.additionalLabels }}
+    {{- with .Values.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:

charts/trieve/charts/postgres/values.yaml

@@ -1,5 +1,8 @@
 installCrds: true
 
+additionalLabels: {}
+  # owner: gen-ai
+
 clusterSpec:
   instances: 3
 

charts/trieve/values.yaml

@@ -1,7 +1,7 @@
 global:
   additionalLabels:
     # Add additional labels to the deployment
-    # owner: gen-ai
+    owner: gen-ai
 
   additionalAnnotations:
     # Add additional annotations to the deployment
@@ -19,6 +19,8 @@ postgres:
   enabled: true
   # Installs cloudnative-pg operator
   installCrds: true
+  # Override additionalLabels to prevent merge conflict with remote chart
+  additionalLabels: {}
   # Pulls from secret if postgres.enabled = true
   # dbURI: "postgres://postgres:[email protected]:5432/trieve"
   # This requires installing cloud-native-pg operator https://cloudnative-pg.io/documentation/1.24/installation_upgrade/