feat: add podLabels to pod template

parcellab/common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: A Helm chart library for parcelLab charts
 type: library
-version: 1.3.9
+version: 1.3.10
 maintainers:
   - name: parcelLab
     email: engineering@parcellab.com

parcellab/common/templates/_pod.tpl

@@ -38,11 +38,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "common.labels" $componentValues | nindent 4 }}
+    {{- /* Merge into one dict so user podLabels can't duplicate keys or override
+           the managed selector labels (which would break the Deployment selector). */}}
+    {{- $managed := include "common.labels" $componentValues | fromYaml }}
     {{- if and $datadog $datadog.enabled }}
-    tags.datadoghq.com/env: {{ include "common.env" . | quote }}
-    tags.datadoghq.com/service: {{ $fullname | quote }}
+    {{- $_ := set $managed "tags.datadoghq.com/env" (include "common.env" . | trim) }}
+    {{- $_ := set $managed "tags.datadoghq.com/service" $fullname }}
     {{- end }}
+    {{- toYaml (merge $managed (.Values.podLabels | default dict)) | nindent 4 }}
 spec:
   {{- with .Values.imagePullSecrets }}
   imagePullSecrets:

parcellab/common/values.yaml

@@ -36,6 +36,9 @@ terminationGracePeriodSeconds: 30
 nodeSelector: {}
 orgRepository: ghcr.io/parcellab
 podAnnotations: {}
+# Extra labels added to the pod template only (merged so they can never override
+# the managed selector labels). E.g. { parcellab.dev/compute: fargate }.
+podLabels: {}
 podDisruptionBudget:
   enabled: false
 podSecurityContext: {}

parcellab/cronjob/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cronjob
 description: Single cron job
-version: 0.5.1
+version: 0.5.2
 dependencies:
   - name: common
     version: "*"

parcellab/cronjob/values.yaml

@@ -78,6 +78,11 @@ nodeSelector: {}
 
 podAnnotations: {}
 
+# Extra labels added to the pod template only (not the selector, which stays
+# immutable). Useful for scheduling controls that key off pod labels, e.g.
+# opting into an EKS Fargate profile: { parcellab.dev/compute: fargate }.
+podLabels: {}
+
 securityContext:
   {}
   # capabilities:

parcellab/microservice/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: microservice
 description: Simple microservice
-version: 0.5.8
+version: 0.5.9
 dependencies:
   - name: common
     version: "*"

parcellab/microservice/values.yaml

@@ -363,6 +363,11 @@ serviceAccount:
 
 podAnnotations: {}
 
+# Extra labels added to the pod template only (not the selector, which stays
+# immutable). Useful for scheduling controls that key off pod labels, e.g.
+# opting into an EKS Fargate profile: { parcellab.dev/compute: fargate }.
+podLabels: {}
+
 replicaCount: 1
 
 strategy:

parcellab/monolith/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: monolith
 description: Application that may define multiple services and cronjobs
-version: 0.5.9
+version: 0.5.10
 dependencies:
   - name: common
     version: "*"

parcellab/monolith/values.yaml

@@ -512,6 +512,11 @@ serviceAccount:
 
 podAnnotations: {}
 
+# Extra labels added to the pod template only (not the selector, which stays
+# immutable). Useful for scheduling controls that key off pod labels, e.g.
+# opting into an EKS Fargate profile: { parcellab.dev/compute: fargate }.
+podLabels: {}
+
 deploymentAnnotations: {}
 
 replicaCount: 1

parcellab/worker-group/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: worker-group
 description: Set of workers that do not expose a service
-version: 0.3.4
+version: 0.3.5
 dependencies:
   - name: common
     version: "*"

parcellab/worker-group/values.yaml

@@ -166,6 +166,11 @@ serviceAccount:
 
 podAnnotations: {}
 
+# Extra labels added to the pod template only (not the selector, which stays
+# immutable). Useful for scheduling controls that key off pod labels, e.g.
+# opting into an EKS Fargate profile: { parcellab.dev/compute: fargate }.
+podLabels: {}
+
 replicaCount: 1
 disableReplicaCount: false