From a6082f6f4e973a7a9be2935726f07c8e3202cf20 Mon Sep 17 00:00:00 2001 From: haider Date: Thu, 17 Oct 2024 15:28:01 +0100 Subject: [PATCH 1/3] - Add node affinity to Neo4J and Solr deployment --- k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml | 8 ++++++++ k8chart-dev/ols4/templates/ols4-solr-deployment.yaml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml b/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml index 9040bc4ad..2adcd1b65 100644 --- a/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml +++ b/k8chart-dev/ols4/templates/ols4-neo4j-deployment.yaml @@ -18,6 +18,14 @@ spec: - 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 3cc4ced22..9cc48808b 100644 --- a/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml +++ b/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml @@ -20,6 +20,14 @@ spec: 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 From 3e9d0b53d77bb650a2211a507a5e86f644137b0c Mon Sep 17 00:00:00 2001 From: haider Date: Thu, 17 Oct 2024 15:42:44 +0100 Subject: [PATCH 2/3] - 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 From c932bb788108388a45a5098566e87f96b7123cdc Mon Sep 17 00:00:00 2001 From: haider Date: Fri, 18 Oct 2024 12:24:55 +0100 Subject: [PATCH 3/3] - Add affinity for Prod Deployment --- k8chart/ols4/templates/ols4-neo4j-deployment.yaml | 10 ++++++++++ k8chart/ols4/templates/ols4-solr-deployment.yaml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/k8chart/ols4/templates/ols4-neo4j-deployment.yaml b/k8chart/ols4/templates/ols4-neo4j-deployment.yaml index 1a380747f..859757d72 100644 --- 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 index e89a0fa10..abf90da64 100644 --- 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: