Add node affinity to Neo4J and Solr deployment (#765)

* - Add node affinity to Neo4J and Solr deployment * - Correct format of affinity * - Add affinity for Prod Deployment
EBISPOT · Oct 21, 2024 · de9bacf · de9bacf
1 parent 4f3b427
commit de9bacf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml b/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml
@@ -14,6 +14,15 @@ spec:
       labels:
         app: {{ .Release.Name }}-neo4j
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - hh-rke-wp-webadmin-56-worker-2.caas.ebi.ac.uk
       volumes:
         - name: {{ .Release.Name }}-neo4j-storage
           persistentVolumeClaim:

diff --git a/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml b/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
@@ -14,6 +14,15 @@ spec:
       labels:
         app: {{ .Release.Name }}-solr
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+                - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - hh-rke-wp-webadmin-56-worker-1.caas.ebi.ac.uk
       volumes:
         - name: {{ .Release.Name }}-solr-storage
           persistentVolumeClaim:

diff --git a/k8chart/ols4/templates/ols4-neo4j-deployment.yaml b/k8chart/ols4/templates/ols4-neo4j-deployment.yaml
@@ -14,6 +14,16 @@ spec:
       labels:
         app: {{ .Release.Name }}-neo4j
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - hh-rke-wp-webadmin-47-worker-2.caas.ebi.ac.uk
+                      - hx-rke-wp-webadmin-40-worker-2.caas.ebi.ac.uk
       volumes:
         - name: {{ .Release.Name }}-neo4j-storage
           persistentVolumeClaim:

diff --git a/k8chart/ols4/templates/ols4-solr-deployment.yaml b/k8chart/ols4/templates/ols4-solr-deployment.yaml
@@ -14,6 +14,16 @@ spec:
       labels:
         app: {{ .Release.Name }}-solr
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - hh-rke-wp-webadmin-47-worker-1.caas.ebi.ac.uk
+                      - hx-rke-wp-webadmin-40-worker-1.caas.ebi.ac.uk
       volumes:
         - name: {{ .Release.Name }}-solr-storage
           persistentVolumeClaim: