Add affinity config

Rub21 · Rub21 · commit 8656416ff311 · 2025-10-17T15:26:59.000-05:00
diff --git a/osm-seed/templates/jobs/changeset-replication-job-deployment.yaml b/osm-seed/templates/jobs/changeset-replication-job-deployment.yaml
@@ -72,4 +72,18 @@ spec:
       nodeSelector:
         {{ .Values.changesetReplicationJob.nodeSelector.label_key }} : {{ .Values.changesetReplicationJob.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.changesetReplicationJob.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.changesetReplicationJob.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.changesetReplicationJob.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/jobs/full-history-job.yaml b/osm-seed/templates/jobs/full-history-job.yaml
@@ -82,5 +82,19 @@ spec:
           nodeSelector:
             {{ .Values.fullHistory.nodeSelector.label_key }} : {{ .Values.fullHistory.nodeSelector.label_value }}
           {{- end }}
+          # Affinity settings
+          {{- if .Values.fullHistory.nodeAffinity.enabled }}
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: {{ .Values.fullHistory.nodeAffinity.key }}
+                        operator: In
+                        values:
+                        {{- range .Values.fullHistory.nodeAffinity.values }}
+                          - {{ . | quote }}
+                        {{- end }}
+          {{- end }}
       backoffLimit: 3
 {{- end }}
diff --git a/osm-seed/templates/jobs/osm-simple-metrics-job.yaml b/osm-seed/templates/jobs/osm-simple-metrics-job.yaml
@@ -66,4 +66,18 @@ spec:
           nodeSelector:
             {{ .Values.osmSimpleMetrics.nodeSelector.label_key }}: {{ .Values.osmSimpleMetrics.nodeSelector.label_value }}
           {{- end }}
+          # Affinity settings
+          {{- if .Values.osmSimpleMetrics.nodeAffinity.enabled }}
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: {{ .Values.osmSimpleMetrics.nodeAffinity.key }}
+                        operator: In
+                        values:
+                        {{- range .Values.osmSimpleMetrics.nodeAffinity.values }}
+                          - {{ . | quote }}
+                        {{- end }}
+          {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/jobs/planet-dump-job.yaml b/osm-seed/templates/jobs/planet-dump-job.yaml
@@ -19,10 +19,6 @@ spec:
       ttlSecondsAfterFinished: 300
       template:
         spec:
-          {{- if .Values.planetDump.nodeSelector.enabled }}
-          nodeSelector:
-            {{ .Values.planetDump.nodeSelector.label_key }} : {{ .Values.planetDump.nodeSelector.label_value }}
-          {{- end }}
           containers:
           - name: {{ .Release.Name }}-planet-dump-job
             image: {{ .Values.planetDump.image.name }}:{{ .Values.planetDump.image.tag }}
@@ -82,5 +78,23 @@ spec:
                 value: {{ .Values.planetDump.resources.requests.memory | default "2Gi" | quote}}
               {{- end }}
           restartPolicy: OnFailure
+          {{- if .Values.planetDump.nodeSelector.enabled }}
+          nodeSelector:
+            {{ .Values.planetDump.nodeSelector.label_key }} : {{ .Values.planetDump.nodeSelector.label_value }}
+          {{- end }}
+          # Affinity settings
+          {{- if .Values.planetDump.nodeAffinity.enabled }}
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: {{ .Values.planetDump.nodeAffinity.key }}
+                        operator: In
+                        values:
+                        {{- range .Values.planetDump.nodeAffinity.values }}
+                          - {{ . | quote }}
+                        {{- end }}
+          {{- end }}
       backoffLimit: 3
 {{- end }}
diff --git a/osm-seed/templates/jobs/populate-apidb-job.yaml b/osm-seed/templates/jobs/populate-apidb-job.yaml
@@ -44,4 +44,18 @@ spec:
         nodeSelector:
           {{ .Values.populateApidb.nodeSelector.label_key }} : {{ .Values.populateApidb.nodeSelector.label_value }}
         {{- end }}
+        # Affinity settings
+        {{- if .Values.populateApidb.nodeAffinity.enabled }}
+        affinity:
+          nodeAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              nodeSelectorTerms:
+                - matchExpressions:
+                    - key: {{ .Values.populateApidb.nodeAffinity.key }}
+                      operator: In
+                      values:
+                      {{- range .Values.populateApidb.nodeAffinity.values }}
+                        - {{ . | quote }}
+                      {{- end }}
+        {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/jobs/replication-job-deployment.yaml b/osm-seed/templates/jobs/replication-job-deployment.yaml
@@ -89,4 +89,18 @@ spec:
       nodeSelector:
         {{ .Values.replicationJob.nodeSelector.label_key }} : {{ .Values.replicationJob.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.replicationJob.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.replicationJob.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.replicationJob.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/jobs/replication-monitoring-job.yaml b/osm-seed/templates/jobs/replication-monitoring-job.yaml
@@ -19,10 +19,6 @@ spec:
       ttlSecondsAfterFinished: 60
       template:
         spec:
-          {{- if .Values.monitoringReplication.nodeSelector.enabled }}
-          nodeSelector:
-            {{ .Values.monitoringReplication.nodeSelector.label_key }} : {{ .Values.monitoringReplication.nodeSelector.label_value }}
-          {{- end }}
           containers:
           - name: {{ .Release.Name }}-replication-monitoring-job
             image: {{ .Values.monitoringReplication.image.name }}:{{ .Values.monitoringReplication.image.tag }}
@@ -78,5 +74,23 @@ spec:
                 value: {{ .Values.monitoringReplication.resources.requests.memory | default "2Gi" | quote}}
               {{- end }}
           restartPolicy: OnFailure
+          {{- if .Values.monitoringReplication.nodeSelector.enabled }}
+          nodeSelector:
+            {{ .Values.monitoringReplication.nodeSelector.label_key }} : {{ .Values.monitoringReplication.nodeSelector.label_value }}
+          {{- end }}
+          # Affinity settings
+          {{- if .Values.monitoringReplication.nodeAffinity.enabled }}
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: {{ .Values.monitoringReplication.nodeAffinity.key }}
+                        operator: In
+                        values:
+                        {{- range .Values.monitoringReplication.nodeAffinity.values }}
+                          - {{ . | quote }}
+                        {{- end }}
+          {{- end }}
       backoffLimit: 3
 {{- end }}
diff --git a/osm-seed/templates/nominatim-api/nominatim-statefulset.yaml b/osm-seed/templates/nominatim-api/nominatim-statefulset.yaml
@@ -124,4 +124,18 @@ spec:
       nodeSelector:
         {{ .Values.nominatimApi.nodeSelector.label_key }} : {{ .Values.nominatimApi.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.nominatimApi.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.nominatimApi.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.nominatimApi.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/osmcha-app/deployment.yaml b/osm-seed/templates/osmcha-app/deployment.yaml
@@ -88,5 +88,19 @@ spec:
       nodeSelector:
         {{ .Values.osmchaApi.nodeSelector.label_key }} : {{ .Values.osmchaApi.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.osmchaApi.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.osmchaApi.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.osmchaApi.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
 
diff --git a/osm-seed/templates/osmcha-db/osmcha-db-statefulset.yaml b/osm-seed/templates/osmcha-db/osmcha-db-statefulset.yaml
@@ -96,4 +96,18 @@ spec:
       nodeSelector:
         {{ .Values.osmchaDb.nodeSelector.label_key }} : {{ .Values.osmchaDb.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.osmchaDb.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.osmchaDb.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.osmchaDb.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/overpass-api/overpass-api-statefulset.yaml b/osm-seed/templates/overpass-api/overpass-api-statefulset.yaml
@@ -92,4 +92,18 @@ spec:
       nodeSelector:
         {{ .Values.overpassApi.nodeSelector.label_key }} : {{ .Values.overpassApi.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.overpassApi.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.overpassApi.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.overpassApi.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/taginfo/taginfo-deployment.yaml b/osm-seed/templates/taginfo/taginfo-deployment.yaml
@@ -61,4 +61,18 @@ spec:
       nodeSelector:
         {{ .Values.taginfo.nodeSelector.label_key }} : {{ .Values.taginfo.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.taginfo.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.taginfo.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.taginfo.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/tasking-manager-api/tm-deployment.yaml b/osm-seed/templates/tasking-manager-api/tm-deployment.yaml
@@ -69,4 +69,18 @@ spec:
       nodeSelector:
         {{ .Values.tmApi.nodeSelector.label_key }} : {{ .Values.tmApi.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.tmApi.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.tmApi.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.tmApi.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/tasking-manager-db/tm-db-statefulset.yaml b/osm-seed/templates/tasking-manager-db/tm-db-statefulset.yaml
@@ -103,4 +103,18 @@ spec:
       nodeSelector:
         {{ .Values.tmDb.nodeSelector.label_key }} : {{ .Values.tmDb.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.tmDb.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.tmDb.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.tmDb.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml b/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml
@@ -106,5 +106,19 @@ spec:
       nodeSelector:
         {{ .Values.tilerDb.nodeSelector.label_key }} : {{ .Values.tilerDb.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.tilerDb.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.tilerDb.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.tilerDb.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml b/osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml
@@ -98,4 +98,18 @@ spec:
       nodeSelector:
         {{ .Values.tilerImposm.nodeSelector.label_key }} : {{ .Values.tilerImposm.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.tilerImposm.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.tilerImposm.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.tilerImposm.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml
@@ -60,5 +60,19 @@ spec:
       nodeSelector:
         {{ .Values.tilerServer.nodeSelector.label_key }} : {{ .Values.tilerServer.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.tilerServer.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.tilerServer.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.tilerServer.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
 {{- end }}
diff --git a/osm-seed/templates/tiler-server/tiler-server-statefulset.yaml b/osm-seed/templates/tiler-server/tiler-server-statefulset.yaml
@@ -73,5 +73,19 @@ spec:
       nodeSelector:
         {{ .Values.tilerServer.nodeSelector.label_key }} : {{ .Values.tilerServer.nodeSelector.label_value }}
       {{- end }}
+      # Affinity settings
+      {{- if .Values.tilerServer.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.tilerServer.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.tilerServer.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
 {{- end }}
 {{- end }}
diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml
