OPSEXP-2435 Add nodeSelector/affinity/tolerations support in mediatio…

…n statefulset (#173)
Alfresco · Jan 3, 2024 · 36648f0 · 36648f0
1 parent 1ce5f33
commit 36648f0
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 2 deletions.
diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: alfresco-search-enterprise
 description: A Helm chart for deploying Alfresco Elasticsearch connector
 type: application
-version: 3.1.0-alpha.1
+version: 3.1.0-alpha.2
 appVersion: 4.0.0.1
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-enterprise
 
-![Version: 3.1.0-alpha.1](https://img.shields.io/badge/Version-3.1.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0.1](https://img.shields.io/badge/AppVersion-4.0.0.1-informational?style=flat-square)
+![Version: 3.1.0-alpha.2](https://img.shields.io/badge/Version-3.1.0--alpha.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0.1](https://img.shields.io/badge/AppVersion-4.0.0.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Elasticsearch connector
 

diff --git a/charts/alfresco-search-enterprise/templates/reindexing-job.yaml b/charts/alfresco-search-enterprise/templates/reindexing-job.yaml
@@ -94,4 +94,16 @@ spec:
               echo 'Alfresco is ready, delay reindexing to give a chance to fully initialise.'
               sleep 30
               echo 'Reindexing started!'
+      {{- with $.Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $.Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $.Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{ end }}
diff --git a/charts/alfresco-search-enterprise/templates/statefulset-mediation.yaml b/charts/alfresco-search-enterprise/templates/statefulset-mediation.yaml
@@ -58,3 +58,15 @@ spec:
               path: /actuator/health
               port: http
           resources: {{- toYaml .Values.resources | nindent 12 }}
+      {{- with $.Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $.Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $.Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/alfresco-search-enterprise/tests/statefulset-mediation_test.yaml b/charts/alfresco-search-enterprise/tests/statefulset-mediation_test.yaml
@@ -0,0 +1,14 @@
+---
+suite: test liveindexing template rendering
+templates:
+  - statefulset-mediation.yaml
+tests:
+  - it: render nodeSelector properly
+    set:
+      nodeSelector:
+        node_label: node_value
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector.node_label
+          value: node_value
+        template: statefulset-mediation.yaml