move to config map as source of truth

ministryofjustice · Dec 3, 2024 · de893f8 · de893f8
1 parent 75eb75a
commit de893f8
Show file tree

Hide file tree

Showing 21 changed files with 68 additions and 106 deletions.
diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
@@ -7,7 +7,12 @@ resources:
 patches:
   - path: patch-ingress-repository.yaml
   - path: patch-ingress-share.yaml
-  - path: patch-live-path-indexing.yaml
-  - path: patch-live-metadata-indexing.yaml
-  - path: patch-live-content-indexing.yaml
+  - path: patch-live-indexing-path.yaml
+  - path: patch-live-indexing-metadata.yaml
+  - path: patch-live-indexing-mediation.yaml
+  - path: patch-live-indexing-content.yaml
   - path: patch-router.yaml
+  - path: patch-tika.yaml
+  - path: patch-transform-misc.yaml
+  - path: patch-transform-libreoffice.yaml
+  - path: patch-transform-imagemagick.yaml
diff --git a/kustomize/base/patch-delete-reindexing-config-map.yaml b/kustomize/base/patch-delete-reindexing-config-map.yaml
@@ -0,0 +1,5 @@
+$patch: delete
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: alfresco-content-services-alfresco-search-enterprise-reindexing-configmap
diff --git a/...ize/base/patch-live-content-indexing.yaml → ...ize/base/patch-live-indexing-content.yaml b/...ize/base/patch-live-content-indexing.yaml → ...ize/base/patch-live-indexing-content.yaml
@@ -18,6 +18,9 @@ spec:
               value: "60000"          # 60 seconds expiry timeout
             - name: JAVA_OPTS
               value: "-Dspring.activemq.packages.trustAll=true"
-            # - name: INPUT_ALFRESCO_CONTENT_BATCH_EVENT_CHANNEL
-            #   value: sjms-batch:contentstore.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
 
diff --git a/...e/base/patch-live-mediation-indexing.yaml → ...e/base/patch-live-indexing-mediation.yaml b/...e/base/patch-live-mediation-indexing.yaml → ...e/base/patch-live-indexing-mediation.yaml
@@ -4,9 +4,6 @@ metadata:
   name: alfresco-search-enterprise-mediation
 spec:
   serviceName: alfresco-search-enterprise-mediation
-  selector:
-    matchLabels:
-      app: alfresco-search-enterprise-mediation
   strategy:
     type: Recreate
   template:
@@ -24,5 +21,8 @@ spec:
               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
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/...ze/base/patch-live-metadata-indexing.yaml → ...ze/base/patch-live-indexing-metadata.yaml b/...ze/base/patch-live-metadata-indexing.yaml → ...ze/base/patch-live-indexing-metadata.yaml
@@ -18,5 +18,8 @@ spec:
               value: "60000"          # 60 seconds expiry timeout
             - name: JAVA_OPTS
               value: "-Dspring.activemq.packages.trustAll=true"
-            # - name: INPUT_ALFRESCO_METADATA_BATCH_EVENT_CHANNEL
-            #   value: sjms-batch:metadata.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20
+            - name: ALFRESCO_SHAREDFILESTORE_BASEURL
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/...ize/preprod/patch-live-indexing-path.yaml → kustomize/base/patch-live-indexing-path.yaml b/...ize/preprod/patch-live-indexing-path.yaml → kustomize/base/patch-live-indexing-path.yaml
@@ -8,5 +8,10 @@ spec:
       containers:
         - name: alfresco-search-enterprise-path
           env:
+            - name: JAVA_OPTS
+              value: "-Dspring.activemq.packages.trustAll=true"
             - 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/
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/kustomize/base/patch-live-path-indexing.yaml b/kustomize/base/patch-live-path-indexing.yaml
diff --git a/kustomize/base/patch-router.yaml b/kustomize/base/patch-router.yaml
@@ -16,3 +16,8 @@ spec:
               value: "30000"          # 30 seconds idle timeout
             - name: SPRING_ACTIVEMQ_POOL_EXPIRY_TIMEOUT
               value: "60000"          # 60 seconds expiry timeout
+            - name: FILE_STORE_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/kustomize/preprod/patch-tika.yaml → kustomize/base/patch-tika.yaml b/kustomize/preprod/patch-tika.yaml → kustomize/base/patch-tika.yaml
@@ -9,4 +9,7 @@ spec:
         - 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
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/.../preprod/patch-transform-imagemagick.yaml → ...ize/base/patch-transform-imagemagick.yaml b/.../preprod/patch-transform-imagemagick.yaml → ...ize/base/patch-transform-imagemagick.yaml
@@ -9,4 +9,8 @@ spec:
         - 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
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
+
diff --git a/.../preprod/patch-transform-libreoffice.yaml → ...ize/base/patch-transform-libreoffice.yaml b/.../preprod/patch-transform-libreoffice.yaml → ...ize/base/patch-transform-libreoffice.yaml
@@ -9,4 +9,7 @@ spec:
         - 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
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/kustomize/preprod/patch-transform-misc.yaml → kustomize/base/patch-transform-misc.yaml b/kustomize/preprod/patch-transform-misc.yaml → kustomize/base/patch-transform-misc.yaml
@@ -9,4 +9,7 @@ spec:
         - 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
+              valueFrom:
+                configMapKeyRef:
+                  name: alfresco-infrastructure
+                  key: SFS_URL_API
diff --git a/kustomize/preprod/kustomization.yaml b/kustomize/preprod/kustomization.yaml
@@ -7,14 +7,5 @@ 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,5 @@ 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/
+  SFS_URL_API: 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-ingress-repository.yaml b/kustomize/preprod/patch-ingress-repository.yaml
@@ -4,7 +4,7 @@ metadata:
   name: alfresco-content-services-alfresco-repository
   annotations:
     external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-repository-hmpps-delius-alfresco-preprod-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-preprod.apps.live.cloud-platform.service.justice.gov.uk

diff --git a/kustomize/preprod/patch-ingress-share.yaml b/kustomize/preprod/patch-ingress-share.yaml
@@ -4,7 +4,7 @@ metadata:
   name: alfresco-content-services-share
   annotations:
     external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-share-hmpps-delius-alfresco-preprod-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-preprod.apps.live.cloud-platform.service.justice.gov.uk

diff --git a/kustomize/preprod/patch-live-indexing-content.yaml b/kustomize/preprod/patch-live-indexing-content.yaml
diff --git a/kustomize/preprod/patch-live-indexing-mediation.yaml b/kustomize/preprod/patch-live-indexing-mediation.yaml
diff --git a/kustomize/preprod/patch-live-indexing-metadata.yaml b/kustomize/preprod/patch-live-indexing-metadata.yaml
diff --git a/kustomize/preprod/patch-router.yaml b/kustomize/preprod/patch-router.yaml
diff --git a/kustomize/preprod/values.yaml b/kustomize/preprod/values.yaml
@@ -40,13 +40,18 @@ alfresco-search-enterprise:
       replicaCount: 4
     metadata:
       replicaCount: 2
+    mediation:
+      replicaCount: 2
 alfresco-transform-service:
   tika:
-    replicaCount: 4
+    replicaCount: 6
     resources:
+      requests:
+        cpu: "0.5"
+        memory: "2048Mi"
       limits:
-        cpu: 2
-        memory: 4Gi
+        cpu: "2"
+        memory: "4096Mi"
   transformrouter:
     replicaCount: 8
     resources: