patching for filestore url

ministryofjustice · Dec 2, 2024 · 4491bcb · 4491bcb
1 parent a477b3f
commit 4491bcb
Show file tree

Hide file tree

Showing 16 changed files with 160 additions and 12 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -113,7 +113,7 @@ tasks:
   simple_reindex:
     cmds:
       - |
-        helm install "reindex-default-$(openssl rand -hex 4)" ./jobs/reindex --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromId=52000100" --set "toId=52001000" --namespace {{.NAMESPACE}}
+        helm install "reindex-default-$(openssl rand -hex 4)" ./jobs/reindex --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromId=52000000" --set "toId=53000000" --namespace {{.NAMESPACE}}
 
   reindex_list:
     cmds:

diff --git a/kustomize/base/patch-live-mediation-indexing.yaml b/kustomize/base/patch-live-mediation-indexing.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: alfresco-search-enterprise-mediation
+spec:
+  serviceName: alfresco-search-enterprise-mediation
+  selector:
+    matchLabels:
+      app: alfresco-search-enterprise-mediation
+  strategy:
+    type: Recreate
+  template:
+    spec:
+      containers:
+        - name: alfresco-search-enterprise-mediation
+          env:
+            - name: SPRING_ACTIVEMQ_POOL_ENABLED
+              value: "true"
+            - name: SPRING_ACTIVEMQ_POOL_MAX_CONNECTIONS
+              value: "100"
+            - name: SPRING_ACTIVEMQ_POOL_IDLE_TIMEOUT
+              value: "30000"          # 30 seconds idle timeout
+            - name: SPRING_ACTIVEMQ_POOL_EXPIRY_TIMEOUT
+              value: "60000"          # 60 seconds expiry timeout
+            - name: JAVA_OPTS
+              value: "-Dspring.activemq.packages.trustAll=true"
+            # - name: INPUT_ALFRESCO_MEDIATION_BATCH_EVENT_CHANNEL
+            #   value: sjms-batch:mediation.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&consumerCount=20
diff --git a/kustomize/base/values.yaml b/kustomize/base/values.yaml
@@ -78,7 +78,7 @@ repository:
       -Dsystem.delete_not_exists.timeout_seconds=3600
       -Dfilecontentstore.subsystem.name=S3
       -Ds3.flatRoot=false
-      -Dsfs.url=https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk
+      -Dsfs.url=https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/
   securityContext:
     allowPrivilegeEscalation: false
     runAsNonRoot: true

diff --git a/kustomize/preprod/kustomization.yaml b/kustomize/preprod/kustomization.yaml
@@ -7,4 +7,14 @@ resources:
 patches:
   - path: patch-ingress-repository.yaml
   - path: patch-ingress-share.yaml
+  # - path: patch-live-indexing-path.yaml
+  # - path: patch-live-indexing-content.yaml
+  # - path: patch-live-indexing-mediation.yaml
+  # - path: patch-live-indexing-metadata.yaml
+  - path: patch-router.yaml
+  - path: patch-tika.yaml
+  - path: patch-transform-misc.yaml
+  - path: patch-transform-libreoffice.yaml
+  - path: patch-transform-imagemagick.yaml
   - path: patch-infra-config-map.yaml
+
diff --git a/kustomize/preprod/patch-infra-config-map.yaml b/kustomize/preprod/patch-infra-config-map.yaml
@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: alfresco-infrastructure
 data:
-  SFS_URL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file
+  SFS_URL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
diff --git a/kustomize/preprod/patch-live-indexing-content.yaml b/kustomize/preprod/patch-live-indexing-content.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-alfresco-search-enterprise-content
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-search-enterprise-content
+          env:
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
diff --git a/kustomize/preprod/patch-live-indexing-mediation.yaml b/kustomize/preprod/patch-live-indexing-mediation.yaml
@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: alfresco-search-enterprise-mediation
+spec:
+  serviceName: alfresco-search-enterprise-mediation
+  selector:
+    matchLabels:
+      app: alfresco-search-enterprise-mediation
+  template:
+    spec:
+      containers:
+        - name: alfresco-search-enterprise-mediation
+          env:
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
diff --git a/kustomize/preprod/patch-live-indexing-metadata.yaml b/kustomize/preprod/patch-live-indexing-metadata.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-alfresco-search-enterprise-metadata
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-search-enterprise-metadata
+          env:
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
diff --git a/kustomize/preprod/patch-live-indexing-path.yaml b/kustomize/preprod/patch-live-indexing-path.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-alfresco-search-enterprise-path
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-search-enterprise-path
+          env:
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
diff --git a/kustomize/preprod/patch-router.yaml b/kustomize/preprod/patch-router.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name:  alfresco-content-services-transform-router
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-transform-service
+          env:
+            - name: FILE_STORE_URL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file
diff --git a/kustomize/preprod/patch-tika.yaml b/kustomize/preprod/patch-tika.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-tika
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-transform-service
+          env:
+            - name: FILE_STORE_URL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file
diff --git a/kustomize/preprod/patch-transform-imagemagick.yaml b/kustomize/preprod/patch-transform-imagemagick.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-imagemagick
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-transform-service
+          env:
+            - name: FILE_STORE_URL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file
diff --git a/kustomize/preprod/patch-transform-libreoffice.yaml b/kustomize/preprod/patch-transform-libreoffice.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-libreoffice
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-transform-service
+          env:
+            - name: FILE_STORE_URL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file
diff --git a/kustomize/preprod/patch-transform-misc.yaml b/kustomize/preprod/patch-transform-misc.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-transform-misc
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-transform-service
+          env:
+            - name: FILE_STORE_URL
+              value: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file
diff --git a/kustomize/preprod/values.yaml b/kustomize/preprod/values.yaml
@@ -14,7 +14,7 @@ alfresco-repository:
   #   periodSeconds: 20
   #   timeoutSeconds: 15
   #   failureThreshold: 40
-  replicaCount: 1
+  replicaCount: 10
   image:
     repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-content-repository
     tag: release_7.3.2_elasticsearch-r5.0.2-content-latest
@@ -25,8 +25,6 @@ alfresco-repository:
     limits:
       cpu: 4
       memory: 10Gi
-  persistence:
-    baseSize: 100Gi
 share:
   replicaCount: 1
   image:
@@ -36,20 +34,22 @@ externalProtocol: https
 externalPort: 443
 alfresco-transform-service:
   tika:
-    replicaCount: 1
+    replicaCount: 4
     resources:
       limits:
         cpu: 2
         memory: 4Gi
   transformrouter:
-    replicaCount: 1
+    replicaCount: 8
     resources:
       requests:
         cpu: "0.75"
-        memory: "300Mi"
+        memory: "512Mi"
       limits:
         cpu: "2"
-        memory: "756Mi"
+        memory: "1024Mi"
 global:
   known_urls:
    - https://hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk
+   - https://share.hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk
+   - https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk
diff --git a/kustomize/stage/values.yaml b/kustomize/stage/values.yaml
@@ -24,8 +24,6 @@ repository:
     limits:
       cpu: 4
       memory: 10Gi
-  persistence:
-    baseSize: 100Gi
 share:
   replicaCount: 1
   image: