From 3e9d0b53d77bb650a2211a507a5e86f644137b0c Mon Sep 17 00:00:00 2001
From: haider <haideriqbal1@hotmail.com>
Date: Thu, 17 Oct 2024 15:42:44 +0100
Subject: [PATCH] - Correct format of affinity

---
 .../ols4/templates/ols4-neo4j-deployment.yaml   | 17 +++++++++--------
 .../ols4/templates/ols4-solr-deployment.yaml    | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml b/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml
index 2adcd1b65..0260ce520 100644
--- a/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml
+++ b/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml
@@ -14,18 +14,19 @@ 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:
             claimName: {{ .Release.Name }}-neo4j-pvc
-      nodeAffinity:
-        required:
-          nodeSelectorTerms:
-              - matchExpressions:
-                - key: kubernetes.io/hostname
-                  operator: In
-                  values:
-                    - hh-rke-wp-webadmin-56-worker-2.caas.ebi.ac.uk
       containers:
         - name: neo4j
           image: ghcr.io/ebispot/ols4-neo4j:4.4.9-community
diff --git a/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml b/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
index 9cc48808b..f23546cf4 100644
--- a/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
+++ b/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
@@ -14,20 +14,21 @@ 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:
             claimName: {{ .Release.Name }}-solr-pvc
       securityContext:
         fsGroup: 8983
-      nodeAffinity:
-        required:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: kubernetes.io/hostname
-                  operator: In
-                  values:
-                    - hh-rke-wp-webadmin-56-worker-1.caas.ebi.ac.uk
       containers:
         - name: solr
           image: ghcr.io/ebispot/ols4-solr:9.0.0