updates

ministryofjustice · Sep 23, 2024 · 5580df7 · 5580df7
1 parent f8ed86f
commit 5580df7
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 28 deletions.
diff --git a/.github/workflows/data-refresh.yaml b/.github/workflows/data-refresh.yaml
@@ -42,7 +42,11 @@ jobs:
       run: |
         kubectl scale deployment alfresco-content-services-alfresco-cs-repository --replicas=0
         kubectl scale deployment alfresco-content-services-alfresco-cs-share --replicas=0        
-        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-liveindexing --replicas=0
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-content --replicas=0
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-metadata --replicas=0
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-path --replicas=0
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-mediation --replicas=0
+        kubectl scale deployment alfresco-content-services-alfresco-router --replicas=0
 
   refresh-db:
     name: Refresh DB
@@ -197,4 +201,8 @@ jobs:
 
         kubectl scale deployment alfresco-content-services-alfresco-cs-repository --replicas=$(echo $HELM_VALUES | jq '.repository.replicaCount')
         kubectl scale deployment alfresco-content-services-alfresco-cs-share --replicas=$(echo $HELM_VALUES | jq '.share.replicaCount')
-        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-liveindexing --replicas=1
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-content --replicas=1
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-metadata --replicas=1
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-path --replicas=1
+        kubectl scale deployment alfresco-content-services-alfresco-search-enterprise-mediation --replicas=1
+        kubectl scale deployment alfresco-content-services-alfresco-router --replicas=1
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -87,7 +87,7 @@ tasks:
         --set database.url={{.RDS_JDBC_URL}} \
         --set global.elasticsearch.host={{.OPENSEARCH_HOST}} \
         --set alfresco-search-enterprise.searchIndex.host={{.OPENSEARCH_HOST}} \
-        --wait --timeout=20m \
+        --wait --timeout=60m \
         --post-renderer ../kustomizer.sh --post-renderer-args "{{.HELM_POST_RENDERER_ARGS}}" \
         {{.DEBUG_FLAG}} {{.ATOMIC_FLAG}}
         echo " "

diff --git a/jobs/reindex/templates/reindexing-job.yaml b/jobs/reindex/templates/reindexing-job.yaml
@@ -73,12 +73,12 @@ spec:
             - name: JAVA_OPTS
               value: >-
                 -Dalfresco.reindex.fromId={{ .Values.fromId }} -Dalfresco.reindex.toId={{ .Values.toId }}
-                -Dalfresco.reindex.multithreadedStepEnabled=true
-                -Dalfresco.reindex.concurrentProcessors=30
-                -Dalfresco.reindex.batchSize=1000
-                -Dalfresco.reindex.pageSize=10000
                 -Dalfresco.reindex.contentIndexingEnabled=true
                 -Dalfresco.reindex.metadataIndexingEnabled=true
+        # -Dalfresco.reindex.multithreadedStepEnabled=true
+        # -Dalfresco.reindex.concurrentProcessors=30
+        # -Dalfresco.reindex.batchSize=1000
+        # -Dalfresco.reindex.pageSize=10000
           ports:
               - name: http
                 containerPort: 8080

diff --git a/jobs/reindex/values.yaml b/jobs/reindex/values.yaml
@@ -9,14 +9,14 @@ tolerations: []
 affinity: {}
 # -- Name of the existing search index, usually created by repo
 indexName: alfresco
-pathIndexingEnabled: true
+pathIndexingEnabled: false
 postgresql:
   url: null
   hostname:
   database:
   existingSecretName: rds-instance-output
 image:
-  tag: 3.2.0
+  tag: 3.2.1
   repository: quay.io/alfresco/alfresco-elasticsearch-reindexing
 resources:
   requests:

diff --git a/kustomize/base/patch-live-content-indexing.yaml b/kustomize/base/patch-live-content-indexing.yaml
@@ -8,7 +8,9 @@ spec:
       containers:
         - name: alfresco-search-enterprise-content
           env:
-            - name: ENABLE_CONTENT_INDEXING
-              value: "true"
-            - name: ACTIVEMQ_POOL_SIZE
-              value: "100"
+            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
+            #   value: "true"
+            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+            #   value: "100"
+            - name: JAVA_OPTS
+              value: "-Dspring.activemq.packages.trustAll=true"
diff --git a/kustomize/base/patch-live-mediation-indexing.yaml b/kustomize/base/patch-live-mediation-indexing.yaml
@@ -8,7 +8,9 @@ spec:
       containers:
         - name: alfresco-search-enterprise-mediation
           env:
-            - name: ENABLE_CONTENT_INDEXING
-              value: "true"
-            - name: ACTIVEMQ_POOL_SIZE
-              value: "100"
+            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
+            #   value: "true"
+            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+            #   value: "100"
+            - name: JAVA_OPTS
+              value: "-Dspring.activemq.packages.trustAll=true"
diff --git a/kustomize/base/patch-live-metadata-indexing.yaml b/kustomize/base/patch-live-metadata-indexing.yaml
@@ -8,7 +8,9 @@ spec:
       containers:
         - name: alfresco-search-enterprise-metadata
           env:
-            - name: ENABLE_CONTENT_INDEXING
-              value: "true"
-            - name: ACTIVEMQ_POOL_SIZE
-              value: "100"
+            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
+            #   value: "true"
+            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+            #   value: "100"
+            - name: JAVA_OPTS
+              value: "-Dspring.activemq.packages.trustAll=true"
diff --git a/kustomize/base/patch-live-path-indexing.yaml b/kustomize/base/patch-live-path-indexing.yaml
@@ -8,7 +8,9 @@ spec:
       containers:
         - name: alfresco-search-enterprise-path
           env:
-            - name: ENABLE_CONTENT_INDEXING
-              value: "true"
-            - name: ACTIVEMQ_POOL_SIZE
-              value: "100"
+            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
+            #   value: "true"
+            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+            #   value: "100"
+            - name: JAVA_OPTS
+              value: "-Dspring.activemq.packages.trustAll=true"
diff --git a/kustomize/base/values.yaml b/kustomize/base/values.yaml
@@ -170,7 +170,7 @@ ooiService:
       cpu: "2"
       memory: "1000Mi"
   environment:
-    JAVA_OPTS: " -Dalfresco.base-url=http://acs-alfresco-cs-repository:80"
+    JAVA_OPTS: "-Dalfresco.base-url=http://acs-alfresco-cs-repository:80"
   readinessProbe:
     initialDelaySeconds: 20
     periodSeconds: 60

diff --git a/kustomize/stage/patch-ingress-repository.yaml b/kustomize/stage/patch-ingress-repository.yaml
@@ -4,7 +4,7 @@ metadata:
   name: alfresco-content-services-alfresco-cs-repository
   annotations:
     external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-repository-hmpps-delius-alfresco-stage-green
-    nginx.ingress.kubernetes.io/whitelist-source-range: "3.10.104.193,3.11.26.150,18.130.189.137,35.178.209.113,3.8.51.207,35.177.252.54,35.176.93.186/32,35.177.125.252/32,35.177.137.160/32,81.134.202.29/32,51.149.250.0/24,51.149.251.0/24,213.121.161.112/28,217.33.148.210/32,13.43.9.198/32,13.42.163.245/32,18.132.208.127/32,51.149.249.0/29,51.149.249.32/29,194.33.192.0/25,194.33.193.0/25,194.33.196.0/25,194.33.197.0/25,195.59.75.0/24,194.33.248.0/29,194.33.249.0/29,62.25.106.209/32,195.92.40.49/32,62.25.109.197/32,195.92.38.16/28,212.137.36.230/32,78.33.10.50/31,78.33.10.52/30,78.33.10.56/30,78.33.10.60/32,78.33.32.99/32,78.33.32.100/30,78.33.32.104/30,78.33.32.108/32,83.98.63.176/29,194.75.210.216/29,217.138.45.109/32,217.138.45.110/32"
+    nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder"
 spec:
   rules:
     - host: hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk

diff --git a/kustomize/stage/patch-ingress-share.yaml b/kustomize/stage/patch-ingress-share.yaml
@@ -4,7 +4,7 @@ metadata:
   name: alfresco-content-services-alfresco-cs-share
   annotations:
     external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-share-hmpps-delius-alfresco-stage-green
-    nginx.ingress.kubernetes.io/whitelist-source-range: "3.10.104.193,3.11.26.150,18.130.189.137,35.178.209.113,3.8.51.207,35.177.252.54,35.176.93.186/32,35.177.125.252/32,35.177.137.160/32,81.134.202.29/32,51.149.250.0/24,51.149.251.0/24,213.121.161.112/28,217.33.148.210/32,13.43.9.198/32,13.42.163.245/32,18.132.208.127/32,51.149.249.0/29,51.149.249.32/29,194.33.192.0/25,194.33.193.0/25,194.33.196.0/25,194.33.197.0/25,195.59.75.0/24,194.33.248.0/29,194.33.249.0/29,62.25.106.209/32,195.92.40.49/32,62.25.109.197/32,195.92.38.16/28,212.137.36.230/32,78.33.10.50/31,78.33.10.52/30,78.33.10.56/30,78.33.10.60/32,78.33.32.99/32,78.33.32.100/30,78.33.32.104/30,78.33.32.108/32,83.98.63.176/29,194.75.210.216/29,217.138.45.109/32,217.138.45.110/32"
+    nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder"
 spec:
   rules:
     - host: share.hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk