feat(common): add support for pod affinity and set default affinity (#31536)

**Description**

This adds preliminary (not verified or sanitized!) support for pod
affinity settings
Also adds a default affinity rule, that ensures workloads with the same
PVCs get scheduled on the same nodes

⚒️ Fixes #27352
⚒️ Fixes #30967
⚒️ Fixes #31693

**⚙️ Type of change**

- [x] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning
- [ ] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):` or `chore(chart-name):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Kjeld Schouten <info@kjeldschouten.nl>
Signed-off-by: Alfred Göppel <43101280+alfi0812@users.noreply.github.com>
Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Alfred Göppel <43101280+alfi0812@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <s.kois@outlook.com>

charts/library/common/Chart.yaml

@@ -48,5 +48,5 @@ sources:
   - https://hub.docker.com/_/
   - https://hub.docker.com/r/mikefarah/yq
 type: library
-version: 28.9.2
+version: 28.10.0
 

charts/library/common/templates/class/_cronjob.tpl

@@ -34,6 +34,7 @@ spec:
             {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
                                       (include "tc.v1.common.lib.metadata.allLabels" $rootCtx | fromYaml)
                                       (include "tc.v1.common.lib.metadata.podLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
+                                      (include "tc.v1.common.lib.metadata.volumeLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
                                       (include "tc.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | fromYaml)) -}}
             {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "labels" $labels) | trim) }}
           labels:

charts/library/common/templates/class/_deployment.tpl

@@ -37,6 +37,7 @@ spec:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
                                   (include "tc.v1.common.lib.metadata.allLabels" $rootCtx | fromYaml)
                                   (include "tc.v1.common.lib.metadata.podLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
+                                  (include "tc.v1.common.lib.metadata.volumeLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
                                   (include "tc.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | fromYaml)) -}}
         {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "labels" $labels) | trim) }}
       labels:

charts/library/common/templates/class/_job.tpl

@@ -34,6 +34,7 @@ spec:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
                                   (include "tc.v1.common.lib.metadata.allLabels" $rootCtx | fromYaml)
                                   (include "tc.v1.common.lib.metadata.podLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
+                                  (include "tc.v1.common.lib.metadata.volumeLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
                                   (include "tc.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | fromYaml)) -}}
         {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "labels" $labels) | trim) }}
       labels:

charts/library/common/templates/class/_statefulset.tpl

@@ -37,6 +37,7 @@ spec:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
                                   (include "tc.v1.common.lib.metadata.allLabels" $rootCtx | fromYaml)
                                   (include "tc.v1.common.lib.metadata.podLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
+                                  (include "tc.v1.common.lib.metadata.volumeLabels" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml)
                                   (include "tc.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | fromYaml)) -}}
         {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "labels" $labels) | trim) }}
       labels:

charts/library/common/templates/lib/metadata/_volumeLabels.tpl

@@ -0,0 +1,16 @@
+{{/* Labels that are added to podSpec */}}
+{{/* Call this template:
+{{ include "tc.v1.common.lib.metadata.volumeLabels" $ }}
+*/}}
+{{- define "tc.v1.common.lib.metadata.volumeLabels" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $objectData := .objectData -}}
+  {{- $selectedVolumes := (include "tc.v1.common.lib.pod.volumes.selected" (dict "rootCtx" $rootCtx "objectData" $objectData)) | fromJson }}
+
+  {{- $names := list -}}
+  {{- range $volume := $selectedVolumes.pvc -}}
+    {{- $names = mustAppend $names $volume.shortName -}}
+  {{- end }}
+
+truecharts.org/pvc: {{ $names | join "_" | quote }}
+{{- end -}}

charts/library/common/templates/lib/pod/_affinity.tpl

@@ -0,0 +1,161 @@
+{{/* Returns pod affinity  */}}
+{{/* Call this template:
+{{ include "tc.v1.common.lib.pod.affinity" (dict "rootCtx" $ "objectData" $objectData) }}
+rootCtx: The root context of the chart.
+objectData: The object data to be used to render the Pod.
+*/}}
+{{- define "tc.v1.common.lib.pod.affinity" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $objectData := .objectData -}}
+
+  {{- $affinity := dict -}}
+
+  {{/* Initialize from the "global" option */}}
+  {{- with $rootCtx.Values.podOptions.affinity -}}
+    {{- $affinity = . -}}
+  {{- end -}}
+
+  {{/* Override with pods option */}}
+  {{- with $objectData.podSpec.affinity -}}
+    {{- $affinity = . -}}
+  {{- end -}}
+
+  {{/* If default affinity is enabled and its one of this types, then merge it with user input */}}
+  {{- $validTypes := (list "Deployment" "StatefulSet") -}}
+  {{- if and (mustHas $objectData.type $validTypes) $rootCtx.Values.podOptions.defaultAffinity }}
+    {{- $defaultAffinity := (include "tc.v1.common.lib.pod.defaultAffinity" (dict "rootCtx" $rootCtx "objectData" $objectData) | fromYaml) -}}
+    {{- $defaultAffinity = $defaultAffinity | default dict -}}
+    {{/* Merge user input overwriting the default */}}
+    {{- $affinity = mustMergeOverwrite $defaultAffinity $affinity -}}
+  {{- end -}}
+
+  {{- include "tc.v1.common.lib.pod.affinity.validation" (dict "rootCtx" $rootCtx "objectData" $affinity) -}}
+
+  {{- if $affinity.nodeAffinity }}
+nodeAffinity:
+  {{- fail "TODO: not implemented" -}}
+  {{- end -}}
+
+  {{- if $affinity.podAffinity }}
+podAffinity:
+    {{- include "tc.v1.common.lib.pod.podAffinityOrPodAntiAffinity" (dict "rootCtx" $rootCtx "data" $affinity.podAffinity) | nindent 2 -}}
+  {{- end -}}
+
+  {{- if $affinity.podAntiAffinity }}
+podAntiAffinity:
+    {{- include "tc.v1.common.lib.pod.podAffinityOrPodAntiAffinity" (dict "rootCtx" $rootCtx "data" $affinity.podAntiAffinity) | nindent 2 -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "tc.v1.common.lib.pod.podAffinityOrPodAntiAffinity" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $data := .data -}}
+
+  {{- if $data -}}
+    {{- if $data.requiredDuringSchedulingIgnoredDuringExecution }}
+  requiredDuringSchedulingIgnoredDuringExecution:
+      {{- range $term := $data.requiredDuringSchedulingIgnoredDuringExecution }}
+    - {{ include "tc.v1.common.lib.pod.podAffinityTerm" (dict "rootCtx" $rootCtx "data" $term) | trim | nindent 6 }}
+      {{- end -}}
+    {{- end -}}
+
+    {{- if $data.preferredDuringSchedulingIgnoredDuringExecution }}
+  preferredDuringSchedulingIgnoredDuringExecution:
+      {{- range $term := $data.preferredDuringSchedulingIgnoredDuringExecution }}
+      - weight: {{ $term.weight }}
+        podAffinityTerm:
+          {{- include "tc.v1.common.lib.pod.podAffinityTerm" (dict "rootCtx" $rootCtx "data" $term.podAffinityTerm) | nindent 10 }}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "tc.v1.common.lib.pod.podAffinityTerm" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $data := .data -}}
+
+  {{- if $data }}
+topologyKey: {{ $data.topologyKey }}
+
+    {{- if $data.matchLabelKeys }}
+matchLabelKeys:
+      {{- range $data.matchLabelKeys }}
+        - {{ . }}
+      {{- end -}}
+    {{- end -}}
+
+    {{- if $data.mismatchLabelKeys }}
+mismatchLabelKeys:
+      {{- range $data.mismatchLabelKeys }}
+        - {{ . }}
+      {{- end -}}
+    {{- end -}}
+
+    {{- if $data.namespaces }}
+namespaces:
+      {{- range $data.namespaces }}
+        - {{ . }}
+      {{- end -}}
+    {{- end -}}
+
+    {{- if $data.labelSelector }}
+labelSelector:
+      {{- include "tc.v1.common.lib.pod.labelSelector" (dict "rootCtx" $rootCtx "data" $data.labelSelector) | nindent 2 -}}
+    {{- end -}}
+
+    {{- if $data.namespaceSelector }}
+namespaceSelector:
+      {{- include "tc.v1.common.lib.pod.labelSelector" (dict "rootCtx" $rootCtx "data" $data.namespaceSelector) | nindent 2 -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "tc.v1.common.lib.pod.labelSelector" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $data := .data }}
+
+  {{- if $data.matchExpressions -}}
+matchExpressions:
+    {{- range $expression := $data.matchExpressions }}
+  - key: {{ $expression.key }}
+    operator: {{ $expression.operator }}
+      {{- if mustHas $expression.operator (list "In" "NotIn") }}
+    values:
+        {{- range $expression.values }}
+      - {{ . }}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+  {{- if $data.matchLabels -}}
+matchLabels:
+    {{- range $key, $value := $data.matchLabels }}
+  {{ $key }}: {{ $value }}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "tc.v1.common.lib.pod.defaultAffinity" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $objectData := .objectData -}}
+
+  {{- $selectedVolumes := (include "tc.v1.common.lib.pod.volumes.selected" (dict "rootCtx" $rootCtx "objectData" $objectData)) | fromJson }}
+
+  {{- $names := list -}}
+  {{- range $volume := $selectedVolumes.pvc -}}
+    {{- $names = mustAppend $names $volume.shortName -}}
+  {{- end }}
+
+  {{- if $names }}
+podAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    - topologyKey: kubernetes.io/hostname
+      labelSelector:
+        matchExpressions:
+          - key: truecharts.org/pvc
+            operator: In
+            values:
+              - {{ $names | join "_" }}
+  {{- end -}}
+{{- end -}}

charts/library/common/templates/lib/pod/_affinityValidation.tpl

@@ -0,0 +1,174 @@
+{{- define "tc.v1.common.lib.pod.affinity.validation" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $objectData := .objectData -}}
+
+  {{- if $objectData.podAffinity -}}
+    {{- include "tc.v1.common.lib.pod.affinity.validation.podAffinityOrPodAntiAffinity" (dict "rootCtx" $rootCtx "data" $objectData.podAffinity "key" "podAffinity") -}}
+  {{- end -}}
+
+  {{- if $objectData.podAntiAffinity -}}
+    {{- include "tc.v1.common.lib.pod.affinity.validation.podAffinityOrPodAntiAffinity" (dict "rootCtx" $rootCtx "data" $objectData.podAntiAffinity "key" "podAntiAffinity") -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "tc.v1.common.lib.pod.affinity.validation.podAffinityOrPodAntiAffinity" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $data := .data -}}
+  {{- $key := .key -}}
+
+  {{- if $data -}}
+    {{- if and (not $data.requiredDuringSchedulingIgnoredDuringExecution) (not $data.preferredDuringSchedulingIgnoredDuringExecution) -}}
+      {{- fail (printf "Affinity - Expected at least one of requiredDuringSchedulingIgnoredDuringExecution or preferredDuringSchedulingIgnoredDuringExecution in [affinity.%s]" $key) -}}
+    {{- end -}}
+
+    {{- if $data.requiredDuringSchedulingIgnoredDuringExecution -}}
+      {{- $itemData := $data.requiredDuringSchedulingIgnoredDuringExecution -}}
+      {{- if not (kindIs "slice" $itemData) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.requiredDuringSchedulingIgnoredDuringExecution] to be a slice but got [%s]" $key (kindOf $itemData)) -}}
+      {{- end -}}
+
+      {{- range $idx, $item := $itemData -}}
+        {{- include "tc.v1.common.lib.pod.affinity.validation.podAffinityTerm" (dict "rootCtx" $rootCtx "data" $item "key" (printf "%s.requiredDuringSchedulingIgnoredDuringExecution.%d" $key $idx)) -}}
+      {{- end -}}
+    {{- end -}}
+
+    {{- if $data.preferredDuringSchedulingIgnoredDuringExecution -}}
+      {{- $itemData := $data.preferredDuringSchedulingIgnoredDuringExecution -}}
+
+      {{- if not (kindIs "slice" $itemData) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.preferredDuringSchedulingIgnoredDuringExecution] to be a slice but got [%s]" $key (kindOf $itemData)) -}}
+      {{- end -}}
+
+      {{- range $idx, $item := $itemData -}}
+        {{- if not (mustHas (kindOf $item.weight) (list "int" "int64" "float64")) -}}
+          {{- fail (printf "Affinity - Expected [affinity.%s.preferredDuringSchedulingIgnoredDuringExecution.%d.weight] to be a number but got [%s]" $key $idx (kindOf $item.weight)) -}}
+        {{- end -}}
+
+        {{- if or (gt ($item.weight | int) 100) (lt ($item.weight | int) 0) -}}
+          {{- fail (printf "Affinity - Expected [affinity.%s.preferredDuringSchedulingIgnoredDuringExecution.%d.weight] to be between 0 and 100 but got [%d]" $key $idx ($item.weight | int)) -}}
+        {{- end -}}
+
+        {{- if not $item.podAffinityTerm -}}
+          {{- fail (printf "Affinity - Expected [affinity.%s.preferredDuringSchedulingIgnoredDuringExecution.%d.podAffinityTerm] to be defined" $key $idx) -}}
+        {{- end -}}
+
+        {{- include "tc.v1.common.lib.pod.affinity.validation.podAffinityTerm" (dict "rootCtx" $rootCtx "data" $item.podAffinityTerm "key" (printf "%s.preferredDuringSchedulingIgnoredDuringExecution.%d.podAffinityTerm" $key $idx)) -}}
+      {{- end -}}
+    {{- end -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{- define "tc.v1.common.lib.pod.affinity.validation.podAffinityTerm" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $data := .data -}}
+  {{- $key := .key -}}
+
+  {{- if not (kindIs "string" $data.topologyKey) -}}
+    {{- fail (printf "Affinity - Expected [affinity.%s.topologyKey] to be a string but got [%s]" $key (kindOf $data.topologyKey)) -}}
+  {{- end -}}
+
+  {{- if $data.matchLabelKeys -}}
+    {{- if not (kindIs "slice" $data.matchLabelKeys) -}}
+      {{- fail (printf "Affinity - Expected [affinity.%s.matchLabelKeys] to be a slice but got [%s]" $key (kindOf $data.matchLabelKeys)) -}}
+    {{- end -}}
+
+    {{- range $idx, $value := $data.matchLabelKeys -}}
+      {{- if not (kindIs "string" $value) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchLabelKeys.%d] to be a string but got [%s]" $key $idx (kindOf $value)) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $data.mismatchLabelKeys -}}
+    {{- if not (kindIs "slice" $data.mismatchLabelKeys) -}}
+      {{- fail (printf "Affinity - Expected [affinity.%s.mismatchLabelKeys] to be a slice but got [%s]" $key (kindOf $data.mismatchLabelKeys)) -}}
+    {{- end -}}
+
+    {{- range $idx, $value := $data.mismatchLabelKeys -}}
+      {{- if not (kindIs "string" $value) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.mismatchLabelKeys.%d] to be a string but got [%s]" $key $idx (kindOf $value)) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $data.namespaces -}}
+    {{- if not (kindIs "slice" $data.namespaces) -}}
+      {{- fail (printf "Affinity - Expected [affinity.%s.namespaces] to be a slice but got [%s]" $key (kindOf $data.namespaces)) -}}
+    {{- end -}}
+
+    {{- range $idx, $value := $data.namespaces -}}
+      {{- if not (kindIs "string" $value) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.namespaces.%d] to be a string but got [%s]" $key $idx (kindOf $value)) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $data.labelSelector -}}
+    {{- include "tc.v1.common.lib.pod.affinity.validation.labelSelector" (dict "rootCtx" $rootCtx "key" (printf "%s.labelSelector" $key) "data" $data.labelSelector) -}}
+  {{- end -}}
+
+  {{- if $data.namespaceSelector -}}
+    {{- include "tc.v1.common.lib.pod.affinity.validation.labelSelector" (dict "rootCtx" $rootCtx "key" (printf "%s.namespaceSelector" $key) "data" $data.namespaceSelector) -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "tc.v1.common.lib.pod.affinity.validation.labelSelector" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $key := .key -}}
+  {{- $data := .data -}}
+
+  {{- if not (kindIs "map" $data) -}}
+    {{- fail (printf "Affinity - Expected [affinity.%s] to be a map but got [%s]" $key (kindOf $data)) -}}
+  {{- end -}}
+
+  {{- if $data.matchLabels -}}
+    {{- if not (kindIs "map" $data.matchLabels) -}}
+      {{- fail (printf "Affinity - Expected [affinity.%s.matchLabels] to be a map but got [%s]" $key (kindOf $data.matchLabels)) -}}
+    {{- end -}}
+
+    {{- range $key, $value := $data.matchLabels -}}
+      {{- if not (kindIs "string" $value) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchLabels.%s] to be a string but got [%s]" $key $key (kindOf $value)) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $data.matchExpressions }}
+    {{- if not (kindIs "slice" $data.matchExpressions) -}}
+      {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions] to be a slice but got [%s]" $key (kindOf $data.matchExpressions)) -}}
+    {{- end -}}
+
+    {{- $validOperators := list "In" "NotIn" "Exists" "DoesNotExist" -}}
+    {{- range $idx, $exp := $data.matchExpressions -}}
+      {{- if not (kindIs "map" $exp) -}}
+        {{- fail (printf "Affinity - Expected item of [affinity.%s.matchExpressions.%d] to be a map but got [%s]" $key $idx (kindOf $exp)) -}}
+      {{- end -}}
+
+      {{- if not (mustHas $exp.operator $validOperators) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions.%d.operator] to be one of [%s] but got [%s]" $key $idx (join ", " $validOperators) $exp.operator) -}}
+      {{- end -}}
+
+      {{- if not (kindIs "string" $exp.key) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions.%d.key] to be a string but got [%s]" $key $idx (kindOf $exp.key)) -}}
+      {{- end -}}
+
+      {{- if and (mustHas $exp.operator (list "In" "NotIn")) (not (kindIs "slice" $exp.values)) -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions.%d.values] to be a slice but got [%s]" $key $idx (kindOf $exp.values)) -}}
+      {{- end -}}
+
+      {{- if and (mustHas $exp.operator (list "Exists" "DoesNotExist")) $exp.values -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions.%d.values] to be empty when operator is Exists or DoesNotExist but got [%v]" $key $idx ($exp.values)) -}}
+      {{- else if not $exp.values -}}
+        {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions.%d.values] to be defined when operator is In or NotIn but got [%s]" $key $idx (kindOf $exp.values)) -}}
+      {{- end -}}
+
+      {{- range $vIdx, $value := $exp.values -}}
+        {{- if not (kindIs "string" $value) -}}
+          {{- fail (printf "Affinity - Expected [affinity.%s.matchExpressions.%d.values.%d] to be a string but got [%s]" $key $idx $vIdx (kindOf $value)) -}}
+        {{- end -}}
+      {{- end -}}
+
+    {{- end -}}
+  {{- end -}}
+{{- end -}}

charts/library/common/templates/lib/pod/_volumes.tpl

@@ -8,76 +8,11 @@ objectData: The object data to be used to render the Pod.
   {{- $rootCtx := .rootCtx -}}
   {{- $objectData := .objectData -}}
 
-  {{- range $name, $persistenceValues := $rootCtx.Values.persistence -}}
-    {{- $enabled := (include "tc.v1.common.lib.util.enabled" (dict
-                  "rootCtx" $rootCtx "objectData" $persistenceValues
-                  "name" $name "caller" "Volumes"
-                  "key" "persistence")) -}}
-    {{- if (eq $enabled "true") -}}
-      {{- $persistence := (mustDeepCopy $persistenceValues) -}}
-      {{- $_ := set $persistence "shortName" $name -}}
-
-      {{- $selected := false -}}
-
-      {{/* If set to true, define volume */}}
-      {{- if $persistence.targetSelectAll -}}
-        {{- $selected = true -}}
-
-      {{/* If the pod is the autopermission */}}
-      {{- else if eq $objectData.shortName "autopermissions" -}}
-        {{- if $persistence.autoPermissions -}}
-          {{- if $persistence.autoPermissions.enabled -}}
-            {{- $selected = true -}}
-          {{- end -}}
-        {{- end -}}
-
-      {{/* If targetSelector is set, check if pod is selected */}}
-      {{- else if $persistence.targetSelector -}}
-        {{- if not (kindIs "map" $persistence.targetSelector) -}}
-          {{- fail (printf "Persistence - Expected [targetSelector] to be [dict], but got [%s]" (kindOf $persistence.targetSelector)) -}}
-        {{- end -}}
-
-        {{- if (mustHas $objectData.shortName (keys $persistence.targetSelector)) -}}
-          {{- $selected = true -}}
-        {{- end -}}
-
-      {{/* If no targetSelector is set or targetSelectAll, check if pod is primary */}}
-      {{- else if $objectData.primary -}}
-        {{- $selected = true -}}
-      {{- end -}}
-
-      {{/* If pod selected */}}
-      {{- if $selected -}}
-        {{/* Define the volume based on type */}}
-        {{- $type := ($persistence.type | default $rootCtx.Values.global.fallbackDefaults.persistenceType) -}}
-
-        {{- include "tc.v1.common.lib.pod.volumes.checkRWO" (dict
-            "rootCtx" $rootCtx "objectData" $objectData "persistence" $persistence
-            "type" $type "name" $name)
-        -}}
-
-        {{- if eq "pvc" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.pvc" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "hostPath" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.hostPath" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "secret" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.secret" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "configmap" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.configmap" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "emptyDir" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.emptyDir" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "nfs" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.nfs" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "iscsi" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.iscsi" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "projected" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.projected" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- else if eq "device" $type -}}
-          {{- include "tc.v1.common.lib.pod.volume.device" (dict "rootCtx" $rootCtx "objectData" $persistence) | trim | nindent 0 -}}
-        {{- end -}}
-
-      {{- end -}}
+  {{- $selectedVolumes := (include "tc.v1.common.lib.pod.volumes.selected" (dict "rootCtx" $rootCtx "objectData" $objectData)) | fromJson -}}
 
+  {{- range $type, $volumes := $selectedVolumes -}}
+    {{- range $volume := $volumes -}}
+      {{- include (printf "tc.v1.common.lib.pod.volume.%s" $type) (dict "rootCtx" $rootCtx "objectData" $volume) | trim | nindent 0 -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
@@ -123,3 +58,65 @@ objectData: The object data to be used to render the Pod.
   {{- end -}}
   {{- $hasRWO -}}
 {{- end -}}
+
+{{- define "tc.v1.common.lib.pod.volumes.selected" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $objectData := .objectData -}}
+
+  {{- $selectedVolumes := dict
+    "pvc" list
+    "secret" list
+    "configmap" list
+    "emptyDir" list
+    "hostPath" list
+    "nfs" list
+    "iscsi" list
+    "projected" list
+    "device" list
+  -}}
+
+  {{- range $name, $persistenceValues := $rootCtx.Values.persistence -}}
+    {{- $enabled := (include "tc.v1.common.lib.util.enabled" (dict
+      "rootCtx" $rootCtx "objectData" $persistenceValues
+      "name" $name "caller" "Volumes"
+      "key" "persistence"))
+    -}}
+
+    {{- if (ne $enabled "true") -}}{{- continue -}}{{- end -}}
+    {{- $persistence := (mustDeepCopy $persistenceValues) -}}
+    {{- $_ := set $persistence "shortName" $name -}}
+
+    {{- $selected := false -}}
+
+    {{- if $persistence.targetSelectAll -}}
+      {{- $selected = true -}}
+    {{- else if eq $objectData.shortName "autopermissions" -}}
+      {{- if and $persistence.autoPermissions $persistence.autoPermissions.enabled -}}
+        {{- $selected = true -}}
+      {{- end -}}
+    {{- else if $persistence.targetSelector -}}
+      {{- if not (kindIs "map" $persistence.targetSelector) -}}
+        {{- fail (printf "Persistence - Expected [targetSelector] to be [dict], but got [%s]" (kindOf $persistence.targetSelector)) -}}
+      {{- end -}}
+
+      {{- if (mustHas $objectData.shortName (keys $persistence.targetSelector)) -}}
+        {{- $selected = true -}}
+      {{- end -}}
+    {{- else if $objectData.primary -}}
+      {{- $selected = true -}}
+    {{- end -}}
+
+    {{- if not $selected -}}{{- continue -}}{{- end -}}
+
+    {{- $type := ($persistence.type | default $rootCtx.Values.global.fallbackDefaults.persistenceType) -}}
+    {{- if eq $type "vct" -}}{{- continue -}}{{- end -}}
+
+    {{- include "tc.v1.common.lib.pod.volumes.checkRWO" (dict
+      "rootCtx" $rootCtx "objectData" $objectData "persistence" $persistence "type" $type "name" $name)
+    -}}
+
+    {{- $_ := set $selectedVolumes $type (mustAppend (index $selectedVolumes $type) $persistence) -}}
+  {{- end -}}
+
+  {{- $selectedVolumes | toJson -}}
+{{- end -}}

charts/library/common/templates/lib/workload/_pod.tpl

@@ -30,6 +30,10 @@ priorityClassName: {{ . }}
 nodeSelector:
     {{- . | nindent 2 }}
   {{- end -}}
+  {{- with (include "tc.v1.common.lib.pod.affinity" (dict "rootCtx" $rootCtx "objectData" $objectData) | trim) }}
+affinity:
+    {{- . | nindent 2 }}
+  {{- end -}}
   {{- with (include "tc.v1.common.lib.pod.topologySpreadConstraints" (dict "rootCtx" $rootCtx "objectData" $objectData) | trim) }}
 topologySpreadConstraints:
     {{- . | nindent 2 }}

charts/library/common/values.yaml

@@ -143,6 +143,7 @@ podOptions:
   # If this key exists, takes precedence over the automated calculation
   # hostUsers: false
   shareProcessNamespace: false
+  affinity: {}
   dnsPolicy: ClusterFirst
   dnsConfig:
     options:
@@ -153,6 +154,7 @@ podOptions:
     kubernetes.io/arch: "amd64"
   # -- Used to enforce a good spread for Deployments and StatefulSets by default
   defaultSpread: true
+  defaultAffinity: true
   topologySpreadConstraints: []
   tolerations: []
   schedulerName: ""
@@ -204,14 +206,14 @@ vpa:
     #   updateMode: auto
     resourcePolicy:
       containerPolicies:
-      - containerName: '*'
-        minAllowed:
-          cpu: 50m
-          memory: 50Mi
-        maxAllowed:
-          cpu: 8000m
-          memory: 20Gi
-        controlledResources: ["cpu", "memory"]
+        - containerName: "*"
+          minAllowed:
+            cpu: 50m
+            memory: 50Mi
+          maxAllowed:
+            cpu: 8000m
+            memory: 20Gi
+          controlledResources: ["cpu", "memory"]
 
 # -- Horizontal pod autoscaler
 hpa:
@@ -250,7 +252,6 @@ hpa:
     #         value: 4
     #         periodSeconds: 60
 
-
 # -- (docs/service/README.md)
 service:
   main: