Update Taskfile.yml

Taskfile.yml

@@ -107,7 +107,7 @@ tasks:
   simple_reindex:
     cmds:
       - | 
-        helm install "reindex-default" ./jobs/reindex --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromId=20000000" --set "toId=40000000" --namespace {{.NAMESPACE}}
+        helm install "reindex-default" ./jobs/reindex --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromId=300000000" --set "toId=350000000" --namespace {{.NAMESPACE}}
         
   batch_reindex:
     vars:

kustomize/base/patch-shared-filestore.yaml

@@ -4,16 +4,14 @@ metadata:
   name: alfresco-content-services-alfresco-filestore
 spec:
   strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 0          # No new pods are created above the desired replica count
-      maxUnavailable: 1    # Allow the old pod to be terminated before the new one starts
+    type: Recreate
+    rollingUpdate: null
   template:
     spec:
       containers:
         - name: alfresco-content-services
           env:
             - name: scheduler.content.age.millis
-              value: "518400000" # 6 days
+              value: "518400000" # 3 days
             - name: scheduler.cleanup.interval
-              value: "259200000" # 3 days
+              value: "259200000" # 1 days

kustomize/base/values.yaml

@@ -567,8 +567,8 @@ filestore:
   replicaCount: 1
   nodeSelector: {}
   image:
-    repository: quay.io/alfresco/alfresco-shared-file-store
-    tag: 2.1.2
+    repository: ghcr.io/ministryofjustice/hmpps-delius-alfresco-shared-file-store
+    tag: 2.1.2-4
     pullPolicy: IfNotPresent
     internalPort: 8099
   initContainer:

kustomize/stage/patch-filestore-pvc.yaml

@@ -5,4 +5,4 @@ metadata:
 spec:
   resources:
     requests:
-      storage: 15000Gi
+      storage: 2500Gi

kustomize/stage/values.yaml

@@ -14,7 +14,7 @@ repository:
   #   periodSeconds: 20
   #   timeoutSeconds: 15
   #   failureThreshold: 40
-  replicaCount: 12
+  replicaCount: 18
   image:
     tag: release_7.3.2_elasticsearch-r5.0.2-content-latest
   resources: # requests and limits set closer together to ensure CP stability
@@ -40,7 +40,7 @@ tika:
       cpu: 2
       memory: 4Gi
 transformrouter:
-  replicaCount: 8
+  replicaCount: 12
   resources:
     requests:
       cpu: "0.75"

tools/scripts/amq-connect.sh

@@ -47,9 +47,9 @@ main() {
     kubectl run port-forward-pod-${RANDOM_HEX}-1 --image=ghcr.io/ministryofjustice/hmpps-delius-alfresco-port-forward-pod:latest --port ${LOCAL_PORT_1} --env="REMOTE_HOST=$HOST_1" --env="LOCAL_PORT=$LOCAL_PORT_1" --env="REMOTE_PORT=$REMOTE_PORT_1" --namespace ${namespace};
     kubectl run port-forward-pod-${RANDOM_HEX}-2 --image=ghcr.io/ministryofjustice/hmpps-delius-alfresco-port-forward-pod:latest --port ${LOCAL_PORT_2} --env="REMOTE_HOST=$HOST_2" --env="LOCAL_PORT=$LOCAL_PORT_2" --env="REMOTE_PORT=$REMOTE_PORT_2" --namespace ${namespace};
     # wait for pod to start
-    kubectl wait --for=condition=ready pod/port-forward-pod-${RANDOM_HEX}-0 --timeout=30s --namespace ${namespace}
-    kubectl wait --for=condition=ready pod/port-forward-pod-${RANDOM_HEX}-1 --timeout=30s --namespace ${namespace}
-    kubectl wait --for=condition=ready pod/port-forward-pod-${RANDOM_HEX}-2 --timeout=30s --namespace ${namespace}
+    kubectl wait --for=condition=ready pod/port-forward-pod-${RANDOM_HEX}-0 --timeout=60s --namespace ${namespace}
+    kubectl wait --for=condition=ready pod/port-forward-pod-${RANDOM_HEX}-1 --timeout=60s --namespace ${namespace}
+    kubectl wait --for=condition=ready pod/port-forward-pod-${RANDOM_HEX}-2 --timeout=60s --namespace ${namespace}
     printf "\nPort forwarding started, connecting to $HOST:$REMOTE_PORT \n"
     printf "\n****************************************************\n"
     printf "Connect to ${PROTOCOL}://localhost:$LOCAL_PORT locally\n"

tools/sfs/Dockerfile

@@ -0,0 +1,5 @@
+FROM quay.io/alfresco/alfresco-shared-file-store:2.1.2
+
+COPY ./alfresco-shared-file-store-2.1.2.jar /usr/bin/alfresco-shared-file-store.jar
+
+ENTRYPOINT ["/bin/sh", "-c", "java $JAVA_OPTS -jar /usr/bin/alfresco-shared-file-store.jar"]