From 6595ceefd83e40766f5805f168b892ac6f72ba2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Maciusiak?=
 <158472457+pmacius@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:52:04 +0100
Subject: [PATCH] OPSEXP-2917 Docs: remove unnecessary Solr shared secret for
 enterprise (#1283)

---
 docs/helm/desktop-deployment.md               | 19 +++++++++-
 docs/helm/examples/external-hazelcast.md      |  1 -
 docs/helm/examples/with-elasticsearch-auth.md | 35 ++++++++++++++-----
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/docs/helm/desktop-deployment.md b/docs/helm/desktop-deployment.md
index ce0464893..dcad7f67c 100644
--- a/docs/helm/desktop-deployment.md
+++ b/docs/helm/desktop-deployment.md
@@ -120,7 +120,6 @@ Once downloaded, execute the following to initiate the deployment.
 ```bash
 helm install acs alfresco/alfresco-content-services \
   --values local-dev_values.yaml \
-  --set global.search.sharedSecret=$(openssl rand -hex 24) \
   --atomic \
   --timeout 10m0s \
   --namespace alfresco
@@ -131,6 +130,24 @@ helm install acs alfresco/alfresco-content-services \
 
 The `helm` command above installs the most current released version of ACS Enterprise.
 
+#### Enterprise with solr6
+
+Use the above helm command with additional arguments that enable solr6 search engine on enterprise.
+
+```bash
+helm install acs alfresco/alfresco-content-services \
+  --values local-dev_values.yaml \
+  --set alfresco-repository.configuration.search.flavor=solr6 \
+  --set global.search.sharedSecret=$(openssl rand -hex 24) \
+  --set alfresco-search-enterprise.enabled=false \
+  --set alfresco-search.enabled=true \
+  --set elasticsearch.enabled=false \
+  --set alfresco-audit-storage.enabled=false \
+  --atomic \
+  --timeout 10m0s \
+  --namespace alfresco
+```
+
 #### Enterprise deployment for previous versions
 
 Use the above helm commands and pass an additional argument as described in this [section](./README.md#previous-versions).
diff --git a/docs/helm/examples/external-hazelcast.md b/docs/helm/examples/external-hazelcast.md
index fd2e610be..6e53683f0 100644
--- a/docs/helm/examples/external-hazelcast.md
+++ b/docs/helm/examples/external-hazelcast.md
@@ -141,7 +141,6 @@ grand_parent: Helm
     ```bash
     helm upgrade acs helm/alfresco-content-services \
     --values local-dev_values.yaml \
-    --set global.search.sharedSecret=$(openssl rand -hex 24) \
     --atomic \
     --timeout 10m0s \
     --values acs-hazelcast.yaml
diff --git a/docs/helm/examples/with-elasticsearch-auth.md b/docs/helm/examples/with-elasticsearch-auth.md
index ce9502ac6..704b5e1b8 100644
--- a/docs/helm/examples/with-elasticsearch-auth.md
+++ b/docs/helm/examples/with-elasticsearch-auth.md
@@ -25,7 +25,7 @@ Ensure you have the following:
 
 ## Steps to Deploy
 
-### 1. Create a Secret
+### Create a Secret
 
 Create env file with passwords. Customize the values as needed for your setup.
 
@@ -48,24 +48,41 @@ kubectl create secret generic elastic-search-secret \
     --from-env-file=elastic.env
 ```
 
-### 2. Understand the Patch File
+### Ingress
 
-Patch file `docs/helm/values/elasticsearch_auth_values.yaml` defines the configuration
-for enabling authentication and integrating Elasticsearch and Kibana with the
+See [ingress-nginx](../ingress-nginx.md) section.
+
+### ACS Chart
+
+See [desktop-deployment](../desktop-deployment.md#acs) section.
+
+### Enterprise local values
+
+Download `local-dev_values.yaml` file as described in
+[desktop-deployment](../desktop-deployment.md#enterprise-localhost-deployment)
+section.
+
+### Understand the Patch File
+
+Patch file `elasticsearch_auth_values.yaml` defines the configuration for
+enabling authentication and integrating Elasticsearch and Kibana with the
 Alfresco deployment. Update the patch file to match your requirements if
 necessary.
 
-### 3. Deploy the Infrastructure
+```bash
+curl -fO https://raw.githubusercontent.com/Alfresco/acs-deployment/master/docs/helm/values/elasticsearch_auth_values.yaml
+```
+
+### Deploy the Infrastructure
 
 Deploy the ACS stack with the appropriate values files.
 
 ```bash
-helm install acs ./helm/alfresco-content-services \
-    --set global.search.sharedSecret="$(openssl rand -hex 24)" \
+helm install acs alfresco/alfresco-content-services \
     --set global.known_urls=http://localhost \
     --set global.alfrescoRegistryPullSecrets=quay-registry-secret \
-    --values docs/helm/values/local-dev_values.yaml \
-    --values docs/helm/values/elasticsearch_auth_values.yaml
+    --values local-dev_values.yaml \
+    --values elasticsearch_auth_values.yaml
 ```
 
 ## Accessing Kibana