create config map with correct values in it and update size limit

ministryofjustice · Dec 5, 2024 · 76ea922 · 76ea922
1 parent de893f8
commit 76ea922
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 8 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=65000000" --set "toId=70000000" --namespace {{.NAMESPACE}}
+        helm install "reindex-default-$(openssl rand -hex 4)" ./jobs/reindex --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromId=150000000" --set "toId=200000000" --namespace {{.NAMESPACE}}
 
   reindex_list:
     cmds:
@@ -193,7 +193,7 @@ tasks:
   simple_reindex_date:
     cmds:
       - |
-        helm install "reindex-default-$(openssl rand -hex 4)" ./jobs/reindex_date --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromTime=201711280001" --set "toTime=201712280001" --namespace {{.NAMESPACE}}
+        helm install "reindex-default-$(openssl rand -hex 4)" ./jobs/reindex_date --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromTime=201707030001" --set "toTime=201707121301" --namespace {{.NAMESPACE}}
 
   simple_reindex_date_metadata-only:
     cmds:

diff --git a/jobs/reindex-list/templates/reindexing-config.yaml b/jobs/reindex-list/templates/reindexing-config.yaml
@@ -6,7 +6,7 @@ data:
   ELASTICSEARCH_INDEXNAME: "{{ .Values.indexName }}"
   {{ template "alfresco-search-enterprise.config.spring" . }}
   ALFRESCO_SHAREDFILESTORE_BASEURL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
-  ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-alfresco-router/transform/config
+  ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-transform-router/transform/config
   ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.pathIndexingEnabled | quote }}
   SPRING_DATASOURCE_URL: {{ .Values.postgresql.url }}
   {{- if .Values.environment }}

diff --git a/jobs/reindex_date/templates/reindexing-config.yaml b/jobs/reindex_date/templates/reindexing-config.yaml
@@ -6,7 +6,7 @@ data:
   ELASTICSEARCH_INDEXNAME: "{{ .Values.indexName }}"
   {{ template "alfresco-search-enterprise.config.spring" . }}
   ALFRESCO_SHAREDFILESTORE_BASEURL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
-  ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-alfresco-router/transform/config
+  ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-transform-router/transform/config
   ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.pathIndexingEnabled | quote }}
   SPRING_DATASOURCE_URL: {{ .Values.postgresql.url }}
   {{- if .Values.environment }}

diff --git a/kustomize/base/values703.yaml b/kustomize/base/values703.yaml
@@ -142,7 +142,7 @@ alfresco-repository:
   # image: set by environment values file
   configuration:
     repository:
-      existingConfigMap: repository
+      existingConfigMap: alf-prop-config-map
       existingSecrets:
         - name: alfresco-license
           key: Alfresco-ent73-NOMSNationalOffenderManagementService-Expires10.03.2025.lic
@@ -181,7 +181,7 @@ alfresco-repository:
   persistence:
     # -- Persist repository data
     enabled: false
-    baseSize: 20Gi
+    baseSize: 100Gi
     # -- Specify a storageClass for dynamic provisioning
     accessModes:
       - ReadWriteOnce

diff --git a/kustomize/preprod/alf-prop-config-map.yaml b/kustomize/preprod/alf-prop-config-map.yaml
@@ -0,0 +1,80 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: alf-prop-config-map
+data: 
+ alfresco-global.properties: |
+    deployment.method=HELM_CHART
+    alfresco.cluster.enabled=true
+    alfresco.host=hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk
+    alfresco.protocol=https
+    alfresco.port=443
+    aos.baseUrlOverwrite=https://hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk/alfresco/aos
+    csrf.filter.origin=https://hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk
+    csrf.filter.referer=https://hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk/.*
+    share.protocol=https
+    share.host=hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk
+    share.port=443
+    local.transform.service.enabled=true
+    transform.service.enabled=false
+    localTransform.core-aio.url=
+    localTransform.pdfrenderer.url=http://alfresco-content-services-pdfrenderer
+    localTransform.imagemagick.url=http://alfresco-content-services-imagemagick
+    localTransform.libreoffice.url=http://alfresco-content-services-libreoffice
+    localTransform.tika.url=http://alfresco-content-services-tika
+    localTransform.misc.url=http://alfresco-content-services-transform-misc
+    events.subsystem.autoStart=false
+    
+    #Zaizi additions
+    zaizi.noms.root.folder=NOMS
+    zaizi.noms.crn.pattern=([A-Z])([0-9]{3})([0-9]{3})
+    zaizi.noms.invalidCharacters=\\/:*\"\"<>|?!$#%^&
+
+    spg.ndelius.users=N00
+    spg.crc.users=C01,C02,C03,C04,C05,C06,C07,C08,C09,C10,C11,C12,C13,C14,C15,C16,C17,C18,C19,C20,C21,C22,C23
+
+    # The User to Schema Cache
+    cache.spgUserToSchemaVersionCache.tx.maxItems=100
+    cache.spgUserToSchemaVersionCache.tx.statsEnabled=${caches.tx.statsEnabled}
+    cache.spgUserToSchemaVersionCache.maxItems=500
+    cache.spgUserToSchemaVersionCache.timeToLiveSeconds=0
+    cache.spgUserToSchemaVersionCache.maxIdleSeconds=0
+    cache.spgUserToSchemaVersionCache.cluster.type=local
+    cache.spgUserToSchemaVersionCache.backup-count=1
+    cache.spgUserToSchemaVersionCache.eviction-policy=LRU
+    cache.spgUserToSchemaVersionCache.eviction-percentage=25
+    cache.spgUserToSchemaVersionCache.merge-policy=hz.ADD_NEW_ENTRY
+    cache.spgUserToSchemaVersionCache.readBackupData=false
+    cache.spgUserToSchemaVersionCache.cluster.type=invalidating
+
+    # Notify when a messaging to be sent to MPX taking morethan specified time. Value is in milliseconds.
+    message.mpx.log.messageSendingTakenMorethan=1000
+
+    zaizi.noms.mpx.schema.version=0-9-9
+    zaizi.noms.mpx.schema.date=2016-09-05
+    messaging.events.nspg.schema=classpath:SPG-XML_Message_Root-V0-9-9.xsd
+
+    zaizi.noms.mpx.schema2.version=0-9-10
+    zaizi.noms.mpx.schema2.date=2017-03-30
+    messaging.events.nspg2.schema=classpath:SPG-XML_Message_Root-V0-9-10-2.xsd
+
+    zaizi.noms.mpx.schema.911.version=0-9-11
+    zaizi.noms.mpx.schema.911.date=2017-09-04
+    messaging.events.nspg.911.schema=classpath:SPG-XML_Message_Root-V0-9-11.xsd
+
+    zaizi.noms.mpx.schema.912.version=0-9-12
+    zaizi.noms.mpx.schema.912.date=2017-12-05
+    messaging.events.nspg.912.schema=classpath:SPG-XML_Message_Root-V0-9-12.xsd
+
+    zaizi.noms.mpx.schema.913.version=0-9-13
+    zaizi.noms.mpx.schema.913.date=2018-02-08
+    messaging.events.nspg.913.schema=classpath:SPG-XML_Message_Root-V0-9-13.xsd
+
+    zaizi.noms.mpx.schema.914.version=0-9-14
+    zaizi.noms.mpx.schema.914.date=2019-10-21
+    messaging.events.nspg.914.schema=classpath:SPG-XML_Message_Root-V0-9-14.xsd
+
+    # NSPG Administration Groups Patch
+    patch.nspg.administration.deferred=false
+    patch.nspg.administration.roles.cronExpression=0 0 0 ? 1 1 2030
+    patch.nspg.administration.roles.startDelay=0
diff --git a/kustomize/preprod/kustomization.yaml b/kustomize/preprod/kustomization.yaml
@@ -3,6 +3,7 @@ kind: Kustomization
 
 resources:
   - ../base
+  - alf-prop-config-map.yaml
 
 patches:
   - path: patch-ingress-repository.yaml

diff --git a/kustomize/preprod/values.yaml b/kustomize/preprod/values.yaml
@@ -29,11 +29,10 @@ share:
   replicaCount: 1
   image:
     repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-share
-    tag: release_7.3.2_elasticsearch-r5.0.2-share-latest
+    tag: release_7.3.2_elasticsearch-r5.0.2-chart-7.0.3-share-latest
 externalProtocol: https
 externalPort: 443
 alfresco-search-enterprise:
-
   liveIndexing:
   # set in value-versions yaml
     content: