refactor(helm): DRY non-preemptible node affinity into shared helpers

Consolidates three duplicate nodeAffinity blocks (backup.mongo, restore,
cronJobs.syncMongoProductionData) into a single top-level value
(nonPreemptibleNodeAffinity) and two reusable helper templates:
- sefaria.nonPreemptibleNodeAffinity: renders nodeAffinity inside an
  existing affinity block (used by mongo-backup, mongo-backup-extra)
- sefaria.nonPreemptibleAffinityBlock: renders a full affinity block
  (used by sync-mongo-production-data, mongo-restore)

Made-with: Cursor

Author: yodem

helm-chart/sefaria/templates/_helpers.tpl

@@ -169,6 +169,29 @@ tasks: {{ .Values.deployEnv }}-tasks
 {{- merge  (fromYaml (include "sefaria.tasks.internalQueues" . )) .Values.tasks.queues | toYaml }}
 {{- end }}
 
+{{/*
+Node affinity to avoid preemptible/spot GKE nodes.
+Renders a nodeAffinity block from .Values.nonPreemptibleNodeAffinity.
+Usage inside an existing affinity: block:
+  {{- include "sefaria.nonPreemptibleNodeAffinity" . | nindent <N> }}
+Usage when no affinity: block exists yet (wraps in affinity:):
+  {{- include "sefaria.nonPreemptibleAffinityBlock" . | nindent <N> }}
+*/}}
+{{- define "sefaria.nonPreemptibleNodeAffinity" -}}
+{{- with .Values.nonPreemptibleNodeAffinity }}
+nodeAffinity:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
+
+{{- define "sefaria.nonPreemptibleAffinityBlock" -}}
+{{- with .Values.nonPreemptibleNodeAffinity }}
+affinity:
+  nodeAffinity:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- end -}}
+
 {{- define "config.domainModules" }}
 {{- $map := dict -}}
 {{- $deployEnv := .Values.deployEnv -}}

helm-chart/sefaria/templates/cronjob/mongo-backup-extra.yaml

@@ -27,10 +27,7 @@ spec:
                       values:
                       - mongo
                   topologyKey: kubernetes.io/hostname
-            {{- if not (empty .Values.backup.mongo.nodeAffinity) }}
-            nodeAffinity:
-              {{- toYaml .Values.backup.mongo.nodeAffinity | nindent 14 }}
-            {{- end }}
+            {{- include "sefaria.nonPreemptibleNodeAffinity" . | nindent 12 }}
           tolerations:
             - key: schedule-on-database-vm
               operator: "Equal"

helm-chart/sefaria/templates/cronjob/mongo-backup.yaml

@@ -27,10 +27,7 @@ spec:
                       values:
                       - mongo
                   topologyKey: kubernetes.io/hostname
-            {{- if not (empty .Values.backup.mongo.nodeAffinity) }}
-            nodeAffinity:
-              {{- toYaml .Values.backup.mongo.nodeAffinity | nindent 14 }}
-            {{- end }}
+            {{- include "sefaria.nonPreemptibleNodeAffinity" . | nindent 12 }}
           tolerations:
             - key: schedule-on-database-vm
               operator: "Equal"

helm-chart/sefaria/templates/cronjob/sync-mongo-production-data.yaml

@@ -19,11 +19,7 @@ spec:
             cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
         spec:
           serviceAccount: {{ .Values.restore.serviceAccount }}
-          {{- if not (empty .Values.cronJobs.syncMongoProductionData.nodeAffinity) }}
-          affinity:
-            nodeAffinity:
-              {{- toYaml .Values.cronJobs.syncMongoProductionData.nodeAffinity | nindent 14 }}
-          {{- end }}
+          {{- include "sefaria.nonPreemptibleAffinityBlock" . | nindent 10 }}
           volumes:
             - name: shared-volume
               emptyDir: {}

helm-chart/sefaria/templates/jobs/mongo-restore.yaml

@@ -17,11 +17,7 @@ spec:
   template:
     spec:
       serviceAccount: {{ .Values.restore.serviceAccount }}
-      {{- if not (empty .Values.restore.nodeAffinity) }}
-      affinity:
-        nodeAffinity:
-          {{- toYaml .Values.restore.nodeAffinity | nindent 10 }}
-      {{- end }}
+      {{- include "sefaria.nonPreemptibleAffinityBlock" . | nindent 6 }}
       volumes:
         - name: shared-volume
           emptyDir:

helm-chart/sefaria/values.yaml

@@ -8,6 +8,16 @@ releaseImageTag:
 
 sandbox: "false"
 
+# Shared node affinity applied to all long-running mongo jobs (backup, restore, sync).
+# Prevents scheduling on preemptible GKE nodes that Google can reclaim mid-run.
+# Set to {} in environment values to allow any node pool.
+nonPreemptibleNodeAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    nodeSelectorTerms:
+      - matchExpressions:
+          - key: cloud.google.com/gke-preemptible
+            operator: DoesNotExist
+
 # This value sets the name of the environment and it's associated objects. Some
 # suggestions for the values are prod/dev/test
 deployEnv: "dev"
@@ -45,13 +55,6 @@ restore:
   bucket: sefaria-mongo-backup
   # tarball:
   serviceAccount: database-backup-read
-  # Avoid GKE preemptible nodes during restore. Set nodeAffinity: {} to allow any pool.
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: cloud.google.com/gke-preemptible
-              operator: DoesNotExist
 # config to backup environment DB
 backup:
   mongo:
@@ -63,13 +66,6 @@ backup:
     archiveBucket: sefaria-mongo-archive
     serviceAccount: database-backup-write
     version: 4.4
-    # Avoid GKE preemptible nodes mid-dump. Set nodeAffinity: {} to allow any pool.
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: cloud.google.com/gke-preemptible
-                operator: DoesNotExist
   postgres:
     enabled: false
     version: 10.3
@@ -450,13 +446,6 @@ cronJobs:
     enabled: false
   syncMongoProductionData:
     enabled: false
-    # Avoid GKE preemptible nodes (VM can be reclaimed mid-download/restore). Set nodeAffinity: {} to allow any pool.
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: cloud.google.com/gke-preemptible
-                operator: DoesNotExist
 
 localSettings:
   DEBUG: true