From 390b7b06e279931eab47c8ecddbda9e2bbc22057 Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <71768+gionn@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:12:48 +0100
Subject: [PATCH] OPSEXP-2435 Fix nodeSelector/affinity/tolerations in SE
 deployment (#170)

---
 charts/alfresco-search-enterprise/Chart.yaml          |  2 +-
 charts/alfresco-search-enterprise/README.md           |  2 +-
 .../templates/liveindexing-deployment.yaml            |  6 +++---
 .../tests/liveindexing-deployment_test.yaml           | 11 +++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
index 0eb258a9..72a4ee37 100644
--- 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.0.2
+version: 3.0.3
 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
index 9c4c3b26..397b091a 100644
--- a/charts/alfresco-search-enterprise/README.md
+++ b/charts/alfresco-search-enterprise/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-enterprise
 
-![Version: 3.0.2](https://img.shields.io/badge/Version-3.0.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)
+![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-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/liveindexing-deployment.yaml b/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
index 27e28f31..8c91c015 100644
--- a/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
+++ b/charts/alfresco-search-enterprise/templates/liveindexing-deployment.yaml
@@ -77,14 +77,14 @@ spec :
           resources: {{- toYaml $.Values.resources | nindent 12 }}
       {{- with $.Values.nodeSelector }}
       nodeSelector:
-        {{- toYaml $ | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with $.Values.affinity }}
       affinity:
-        {{- toYaml $ | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with $.Values.tolerations }}
       tolerations:
-        {{- toYaml $ | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
index a3a29a68..1cdce08d 100644
--- a/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/liveindexing-deployment_test.yaml
@@ -138,3 +138,14 @@ tests:
             limits:
               cpu: "2"
               memory: "2048Mi"
+
+  - it: render nodeSelector properly
+    values: *testvalues
+    set:
+      nodeSelector:
+        node_label: node_value
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector.node_label
+          value: node_value
+        template: liveindexing-deployment.yaml