From a9767de80fb188b48abf285e9139ab088090aa7c Mon Sep 17 00:00:00 2001
From: Sohel Saiyed <sohel.saiyed@alfresco.com>
Date: Wed, 17 Jun 2020 15:52:59 +0100
Subject: [PATCH] =?UTF-8?q?[AAE-2868]=20-=20Update=20infrastructure=20helm?=
 =?UTF-8?q?=20chart=20to=20define=20email=20connect=E2=80=A6=20(#38)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [AAE-2868] - Update infrastructure helm chart to define email connector configurations

* update ReadMe
---
 README.md                                     | 16 +++++++++++++
 .../alfresco-process-infrastructure/README.md |  4 ++++
 .../values.yaml                               | 23 +++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/README.md b/README.md
index dcc70d346..c6aaf9a93 100644
--- a/README.md
+++ b/README.md
@@ -216,6 +216,22 @@ HELM_OPTS+="
 "
 ```
 
+### Email Connector
+
+***NB***
+In order to set email connector all the variables need to be set. If these variables are set then deployment service will use these configs as default for any applications deployed. Once these variables are configured at the deployment of chart via Helm customer won’t have the possibility to override these values from the admin app. In case you want to configure email connector variable from admin-app please dont not configure email connector during helm deployment. 
+
+Add the helm properties to configure email connector:
+
+```bash
+HELM_OPTS+="
+  --set alfresco-deployment-service.applications.connectors.emailConnector.username=${email_connecor_username}
+  --set alfresco-deployment-service.applications.connectors.emailConnector.password=${email_connector_password}
+  --set alfresco-deployment-service.applications.connectors.emailConnector.host=${email_connector_host}
+  --set alfresco-deployment-service.applications.connectors.emailConnector.port=${email_connector_port}
+"
+```
+
 ## launch helm
 
 Set install parameters:
diff --git a/helm/alfresco-process-infrastructure/README.md b/helm/alfresco-process-infrastructure/README.md
index bab8bb9b3..42117f398 100644
--- a/helm/alfresco-process-infrastructure/README.md
+++ b/helm/alfresco-process-infrastructure/README.md
@@ -35,6 +35,10 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf
 | alfresco-admin-app.ingress.path | string | `"/admin"` |  |
 | alfresco-admin-app.nameOverride | string | `"alfresco-admin-app"` |  |
 | alfresco-deployment-service.alfresco-content-services.enabled | bool | `true` |  |
+| alfresco-deployment-service.applications.connectors.emailConnector.host | string | `""` |In order to apply default account configuration to the email connector, all the variables need to be set. All email connectors in every applications in the cluster will share the same account.|
+| alfresco-deployment-service.applications.connectors.emailConnector.password | string | `""` |In order to apply default account configuration to the email connector, all the variables need to be set. All email connectors in every applications in the cluster will share the same account.|
+| alfresco-deployment-service.applications.connectors.emailConnector.port | string | `""` |In order to apply default account configuration to the email connector, all the variables need to be set. All email connectors in every applications in the cluster will share the same account.|
+| alfresco-deployment-service.applications.connectors.emailConnector.username | string | `""` |In order to apply default account configuration to the email connector, all the variables need to be set. All email connectors in every applications in the cluster will share the same account.|
 | alfresco-deployment-service.applications.database.external | bool | `false` |  |
 | alfresco-deployment-service.connectorVolume.permission | string | `"ReadWriteMany"` |  |
 | alfresco-deployment-service.connectorVolume.storageClass | string | `"default-sc"` |  |
diff --git a/helm/alfresco-process-infrastructure/values.yaml b/helm/alfresco-process-infrastructure/values.yaml
index a08da819c..33c87b313 100644
--- a/helm/alfresco-process-infrastructure/values.yaml
+++ b/helm/alfresco-process-infrastructure/values.yaml
@@ -219,6 +219,12 @@ alfresco-deployment-service:
   applications:
     database:
       external: false
+    connectors:
+      emailConnector:
+        username: ""
+        password: ""
+        host: ""
+        port: ""
   ingress:
     path: /deployment-service
     enabled: true
@@ -316,6 +322,23 @@ alfresco-deployment-service:
       value: "{{ .Values.connectorVolume.permission }}"
     - name: APPLICATIONS_DATABASE_EXTERNAL
       value: "{{ .Values.applications.database.external }}"
+    {{- if .Values.applications.connectors.emailConnector.username }}
+    - name: CONNECTOR_EMAILCONNECTOR_USERNAME
+      value: "{{ .Values.applications.connectors.emailConnector.username }}"
+    {{- end }}
+    {{- if .Values.applications.connectors.emailConnector.password }}
+    - name: CONNECTOR_EMAILCONNECTOR_PASSWORD
+      value: "{{ .Values.applications.connectors.emailConnector.password }}"
+    {{- end }}
+    {{- if .Values.applications.connectors.emailConnector.host }}
+    - name: CONNECTOR_EMAILCONNECTOR_HOST
+      value: "{{ .Values.applications.connectors.emailConnector.host }}"
+    {{- end }}
+    {{- if .Values.applications.connectors.emailConnector.port }}
+    - name: CONNECTOR_EMAILCONNECTOR_PORT
+      value: "{{ .Values.applications.connectors.emailConnector.port }}"
+    {{- end }}
+
 
 alfresco-admin-app:
   nameOverride: "alfresco-admin-app"