filestore patch

ministryofjustice · Sep 18, 2024 · f8ed86f · f8ed86f
1 parent 274e352
commit f8ed86f
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 29 deletions.
diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
@@ -12,3 +12,4 @@ patches:
   - path: patch-live-metadata-indexing.yaml
   - path: patch-live-content-indexing.yaml
   - path: patch-live-mediation-indexing.yaml
+  - path: patch-shared-filestore.yaml
diff --git a/kustomize/base/patch-shared-filestore.yaml b/kustomize/base/patch-shared-filestore.yaml
@@ -0,0 +1,15 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: alfresco-content-services-alfresco-filestore
+spec:
+  template:
+    spec:
+      containers:
+        - name: alfresco-content-services
+          env:
+            - name: scheduler.content.age.millis
+              value: "3600000"
+            - name: scheduler.cleanup.interval
+              value: "1800000"
+
diff --git a/kustomize/base/values.yaml b/kustomize/base/values.yaml
@@ -238,7 +238,7 @@ transformrouter:
   nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-transform-router
-    tag: 2.1.2
+    tag: 2.0.0
     pullPolicy: IfNotPresent
     internalPort: 8095
   service:
@@ -282,7 +282,7 @@ pdfrenderer:
   nodeSelector: {}
   image:
     repository: alfresco/alfresco-pdf-renderer
-    tag: 3.1.2
+    tag: 3.0.0
     pullPolicy: IfNotPresent
     internalPort: 8090
   service:
@@ -330,7 +330,7 @@ imagemagick:
   nodeSelector: {}
   image:
     repository: alfresco/alfresco-imagemagick
-    tag: 3.1.2
+    tag: 3.0.0
     pullPolicy: IfNotPresent
     internalPort: 8090
   service:
@@ -378,7 +378,7 @@ libreoffice:
   nodeSelector: {}
   image:
     repository: alfresco/alfresco-libreoffice
-    tag: 3.1.2
+    tag: 3.0.0
     pullPolicy: IfNotPresent
     internalPort: 8090
   service:
@@ -426,7 +426,7 @@ tika:
   nodeSelector: {}
   image:
     repository: alfresco/alfresco-tika
-    tag: 3.1.2
+    tag: 3.0.0
     pullPolicy: IfNotPresent
     internalPort: 8090
   service:
@@ -475,7 +475,7 @@ transformmisc:
   nodeSelector: {}
   image:
     repository: alfresco/alfresco-transform-misc
-    tag: 3.1.2
+    tag: 3.0.0
     pullPolicy: IfNotPresent
     internalPort: 8090
   service:
@@ -823,7 +823,6 @@ alfresco-search-enterprise:
 alfresco-digital-workspace:
   nodeSelector: {}
   enabled: false
-  nameOverride: "alfresco-dw"
   service:
     envType: frontend
   ingress:

diff --git a/kustomize/stage/patch-filestore-pvc.yaml b/kustomize/stage/patch-filestore-pvc.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   resources:
     requests:
-      storage: 250Gi
+      storage: 500Gi
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: "placeholder"
+    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"
 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: "placeholder"
+    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"
 spec:
   rules:
     - host: share.hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk

diff --git a/kustomize/stage/values.yaml b/kustomize/stage/values.yaml
@@ -1,29 +1,29 @@
 # this file overrides values defined in ./values.yaml
 repository:
     # -- The startup probe to cover the worse case startup time for slow clusters
-  startupProbe:
-    periodSeconds: 30
-    failureThreshold: 40
-  readinessProbe:
-    initialDelaySeconds: 60
-    periodSeconds: 30
-    timeoutSeconds: 15
-    failureThreshold: 40  # Increased from 6 to 12
-  livenessProbe:
-    initialDelaySeconds: 260  # Increased from 130 to 260
-    periodSeconds: 20
-    timeoutSeconds: 15
-    failureThreshold: 40
-  replicaCount: 1
+  # startupProbe:
+  #   periodSeconds: 30
+  #   failureThreshold: 40
+  # readinessProbe:
+  #   initialDelaySeconds: 60
+  #   periodSeconds: 30
+  #   timeoutSeconds: 15
+  #   failureThreshold: 40  # Increased from 6 to 12
+  # livenessProbe:
+  #   initialDelaySeconds: 260  # Increased from 130 to 260
+  #   periodSeconds: 20
+  #   timeoutSeconds: 15
+  #   failureThreshold: 40
+  replicaCount: 6
   image:
     tag: release_7.3.2_elasticsearch-r5.0.2-content-latest
   resources: # requests and limits set closer together to ensure CP stability
     requests:
+      cpu: 2
+      memory: 8Gi
+    limits:
       cpu: 4
       memory: 16Gi
-    limits:
-      cpu: 6
-      memory: 24Gi
   persistence:
     baseSize: 100Gi
 share:
@@ -38,6 +38,6 @@ tika:
   resources:
     limits:
       cpu: 2
-      memory: 2Gi
+      memory: 4Gi
 transformrouter:
-  replicaCount: 2
+  replicaCount: 1