Fix reverse label merge order

braintrust/templates/api-configmap.yaml

@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.api.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.api.labels) }}
+  {{- with (merge (deepCopy .Values.api.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/api-deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ .Values.api.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.api.labels) }}
+  {{- with (merge (deepCopy .Values.api.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -31,7 +31,7 @@ spec:
         {{- if and (eq .Values.cloud "google") .Values.api.enableGcsAuth }}
         gke-workload-identity/use: "true"
         {{- end }}
-        {{- with (merge (deepCopy .Values.global.labels) .Values.api.labels .Values.api.podLabels) }}
+        {{- with (merge (deepCopy .Values.api.podLabels) .Values.api.labels .Values.global.labels) }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:

braintrust/templates/api-service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ .Values.api.service.name | default .Values.api.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.api.labels) }}
+  {{- with (merge (deepCopy .Values.api.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/api-serviceaccount.yaml

@@ -3,7 +3,7 @@ kind: ServiceAccount
 metadata:
   name: {{ .Values.api.serviceAccount.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.api.labels) }}
+  {{- with (merge (deepCopy .Values.api.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/brainstore-reader-configmap.yaml

@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.brainstore.reader.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.reader.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.reader.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/brainstore-reader-deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ .Values.brainstore.reader.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.reader.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.reader.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -31,7 +31,7 @@ spec:
         {{- if eq .Values.cloud "google" }}
         gke-workload-identity/use: "true"
         {{- end }}
-        {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.reader.labels .Values.brainstore.reader.podLabels) }}
+        {{- with (merge (deepCopy .Values.brainstore.reader.podLabels) .Values.brainstore.reader.labels .Values.global.labels) }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:

braintrust/templates/brainstore-reader-service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ .Values.brainstore.reader.service.name | default .Values.brainstore.reader.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.reader.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.reader.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/brainstore-serviceaccount.yaml

@@ -3,7 +3,7 @@ kind: ServiceAccount
 metadata:
   name: {{ .Values.brainstore.serviceAccount.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/brainstore-writer-configmap.yaml

@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.brainstore.writer.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.writer.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.writer.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/templates/brainstore-writer-deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ .Values.brainstore.writer.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.writer.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.writer.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -31,7 +31,7 @@ spec:
         {{- if eq .Values.cloud "google" }}
         gke-workload-identity/use: "true"
         {{- end }}
-        {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.writer.labels .Values.brainstore.writer.podLabels) }}
+        {{- with (merge (deepCopy .Values.brainstore.writer.podLabels) .Values.brainstore.writer.labels .Values.global.labels) }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:

braintrust/templates/brainstore-writer-service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ .Values.brainstore.writer.service.name | default .Values.brainstore.writer.name }}
   namespace: {{ include "braintrust.namespace" . }}
-  {{- with (merge (deepCopy .Values.global.labels) .Values.brainstore.writer.labels) }}
+  {{- with (merge (deepCopy .Values.brainstore.writer.labels) .Values.global.labels) }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

braintrust/tests/labels-merge-isolation_test.yaml

@@ -206,11 +206,11 @@ tests:
           value: platform
 
   # Note: Helm's merge function gives precedence to the destination (first argument).
-  # With `merge (deepCopy .Values.global.labels) .Values.component.labels`,
-  # global labels take precedence over component labels when keys conflict.
-  # Component labels are only added if the key doesn't exist in global labels.
+  # With `merge (deepCopy .Values.component.labels) .Values.global.labels`,
+  # component labels take precedence over global labels when keys conflict.
+  # Global labels are only added if the key doesn't exist in component labels.
 
-  - it: should give global labels precedence over API labels when keys conflict
+  - it: should give component labels precedence over global labels when keys conflict (API)
     values:
       - __fixtures__/base-values.yaml
     set:
@@ -221,16 +221,16 @@ tests:
       namespace: "braintrust"
     template: api-deployment.yaml
     asserts:
-      # Global label takes precedence for conflicting key
+      # Component label takes precedence for conflicting key
       - equal:
           path: metadata.labels.tier
-          value: global-tier
+          value: api-tier
       # Non-conflicting component label is still added
       - equal:
           path: metadata.labels["api-only"]
           value: api-value
 
-  - it: should give global labels precedence over Reader labels when keys conflict
+  - it: should give component labels precedence over global labels when keys conflict (Reader)
     values:
       - __fixtures__/base-values.yaml
     set:
@@ -241,16 +241,16 @@ tests:
       namespace: "braintrust"
     template: brainstore-reader-deployment.yaml
     asserts:
-      # Global label takes precedence for conflicting key
+      # Component label takes precedence for conflicting key
       - equal:
           path: metadata.labels.tier
-          value: global-tier
+          value: reader-tier
       # Non-conflicting component label is still added
       - equal:
           path: metadata.labels["reader-only"]
           value: reader-value
 
-  - it: should give global labels precedence over Writer labels when keys conflict
+  - it: should give component labels precedence over global labels when keys conflict (Writer)
     values:
       - __fixtures__/base-values.yaml
     set:
@@ -261,10 +261,10 @@ tests:
       namespace: "braintrust"
     template: brainstore-writer-deployment.yaml
     asserts:
-      # Global label takes precedence for conflicting key
+      # Component label takes precedence for conflicting key
       - equal:
           path: metadata.labels.tier
-          value: global-tier
+          value: writer-tier
       # Non-conflicting component label is still added
       - equal:
           path: metadata.labels["writer-only"]