From 098625d4c9ce5899428be9a1cc5d7163705c242a Mon Sep 17 00:00:00 2001 From: George Taylor Date: Thu, 5 Dec 2024 01:29:15 +0000 Subject: [PATCH] Update readme (#117) * fix: matrix env typo (#110) * chore: add awscli to utils container (#111) * correct values for preprod * move to config map as source of truth * create config map with correct values in it and update size limit --------- Co-authored-by: Andrew Moore <20435317+andrewmooreio@users.noreply.github.com> --- .github/workflows/opensearch-backup.yml | 3 +- Taskfile.yml | 4 +- .../templates/reindexing-config.yaml | 2 +- .../templates/reindexing-config.yaml | 2 +- kustomize/base/kustomization.yaml | 11 ++- .../patch-delete-reindexing-config-map.yaml | 5 ++ ....yaml => patch-live-indexing-content.yaml} | 7 +- ...aml => patch-live-indexing-mediation.yaml} | 10 +-- ...yaml => patch-live-indexing-metadata.yaml} | 7 +- .../patch-live-indexing-path.yaml | 7 +- kustomize/base/patch-live-path-indexing.yaml | 22 ----- kustomize/base/patch-router.yaml | 5 ++ kustomize/{preprod => base}/patch-tika.yaml | 5 +- .../patch-transform-imagemagick.yaml | 6 +- .../patch-transform-libreoffice.yaml | 5 +- .../patch-transform-misc.yaml | 5 +- kustomize/base/values703.yaml | 4 +- kustomize/preprod/alf-prop-config-map.yaml | 80 +++++++++++++++++++ kustomize/preprod/kustomization.yaml | 10 +-- kustomize/preprod/patch-infra-config-map.yaml | 3 +- .../preprod/patch-ingress-repository.yaml | 2 +- kustomize/preprod/patch-ingress-share.yaml | 2 +- .../preprod/patch-live-indexing-content.yaml | 12 --- .../patch-live-indexing-mediation.yaml | 16 ---- .../preprod/patch-live-indexing-metadata.yaml | 12 --- kustomize/preprod/patch-router.yaml | 12 --- kustomize/preprod/values.yaml | 20 ++++- tools/utils/Dockerfile | 2 +- 28 files changed, 166 insertions(+), 115 deletions(-) create mode 100644 kustomize/base/patch-delete-reindexing-config-map.yaml rename kustomize/base/{patch-live-content-indexing.yaml => patch-live-indexing-content.yaml} (77%) rename kustomize/base/{patch-live-mediation-indexing.yaml => patch-live-indexing-mediation.yaml} (73%) rename kustomize/base/{patch-live-metadata-indexing.yaml => patch-live-indexing-metadata.yaml} (77%) rename kustomize/{preprod => base}/patch-live-indexing-path.yaml (53%) delete mode 100644 kustomize/base/patch-live-path-indexing.yaml rename kustomize/{preprod => base}/patch-tika.yaml (56%) rename kustomize/{preprod => base}/patch-transform-imagemagick.yaml (57%) rename kustomize/{preprod => base}/patch-transform-libreoffice.yaml (57%) rename kustomize/{preprod => base}/patch-transform-misc.yaml (57%) create mode 100644 kustomize/preprod/alf-prop-config-map.yaml delete mode 100644 kustomize/preprod/patch-live-indexing-content.yaml delete mode 100644 kustomize/preprod/patch-live-indexing-mediation.yaml delete mode 100644 kustomize/preprod/patch-live-indexing-metadata.yaml delete mode 100644 kustomize/preprod/patch-router.yaml diff --git a/.github/workflows/opensearch-backup.yml b/.github/workflows/opensearch-backup.yml index ac3b5e3..783804e 100644 --- a/.github/workflows/opensearch-backup.yml +++ b/.github/workflows/opensearch-backup.yml @@ -16,6 +16,7 @@ on: - test - stage - preprod + - prod jobs: backup: @@ -24,7 +25,7 @@ jobs: strategy: matrix: - environment: ${{ github.event_name == 'schedule' && fromJson('["poc," "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }} + environment: ${{ github.event_name == 'schedule' && fromJson('["poc", "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }} environment: ${{ matrix.environment }}-preapproved diff --git a/Taskfile.yml b/Taskfile.yml index e5adc76..fe93bd9 100644 --- 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=52000000" --set "toId=53000000" --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 index aec8c2e..1de8cb2 100644 --- 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 index 11199b1..9c1cba6 100644 --- 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/kustomization.yaml b/kustomize/base/kustomization.yaml index a3547aa..332fb04 100644 --- 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 new file mode 100644 index 0000000..f46c94b --- /dev/null +++ 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/kustomize/base/patch-live-content-indexing.yaml b/kustomize/base/patch-live-indexing-content.yaml similarity index 77% rename from kustomize/base/patch-live-content-indexing.yaml rename to kustomize/base/patch-live-indexing-content.yaml index 8d24aa9..f28469f 100644 --- a/kustomize/base/patch-live-content-indexing.yaml +++ b/kustomize/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/kustomize/base/patch-live-mediation-indexing.yaml b/kustomize/base/patch-live-indexing-mediation.yaml similarity index 73% rename from kustomize/base/patch-live-mediation-indexing.yaml rename to kustomize/base/patch-live-indexing-mediation.yaml index d91f4df..b5dfe50 100644 --- a/kustomize/base/patch-live-mediation-indexing.yaml +++ b/kustomize/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/kustomize/base/patch-live-metadata-indexing.yaml b/kustomize/base/patch-live-indexing-metadata.yaml similarity index 77% rename from kustomize/base/patch-live-metadata-indexing.yaml rename to kustomize/base/patch-live-indexing-metadata.yaml index 3d93309..ae99a76 100644 --- a/kustomize/base/patch-live-metadata-indexing.yaml +++ b/kustomize/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/kustomize/preprod/patch-live-indexing-path.yaml b/kustomize/base/patch-live-indexing-path.yaml similarity index 53% rename from kustomize/preprod/patch-live-indexing-path.yaml rename to kustomize/base/patch-live-indexing-path.yaml index d4f1798..5690f65 100644 --- a/kustomize/preprod/patch-live-indexing-path.yaml +++ b/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 deleted file mode 100644 index 14baae9..0000000 --- a/kustomize/base/patch-live-path-indexing.yaml +++ /dev/null @@ -1,22 +0,0 @@ -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: SPRING_ACTIVEMQ_POOL_ENABLED - # value: "true" - # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS - # 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_PATH_BATCH_EVENT_CHANNEL - # value: sjms-batch:path.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20 diff --git a/kustomize/base/patch-router.yaml b/kustomize/base/patch-router.yaml index ac1e81e..d557fc5 100644 --- 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 b/kustomize/base/patch-tika.yaml similarity index 56% rename from kustomize/preprod/patch-tika.yaml rename to kustomize/base/patch-tika.yaml index 547125a..0d2c6ce 100644 --- a/kustomize/preprod/patch-tika.yaml +++ b/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/kustomize/preprod/patch-transform-imagemagick.yaml b/kustomize/base/patch-transform-imagemagick.yaml similarity index 57% rename from kustomize/preprod/patch-transform-imagemagick.yaml rename to kustomize/base/patch-transform-imagemagick.yaml index 3819ee0..cf9a79c 100644 --- a/kustomize/preprod/patch-transform-imagemagick.yaml +++ b/kustomize/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/kustomize/preprod/patch-transform-libreoffice.yaml b/kustomize/base/patch-transform-libreoffice.yaml similarity index 57% rename from kustomize/preprod/patch-transform-libreoffice.yaml rename to kustomize/base/patch-transform-libreoffice.yaml index c3ffa1f..1b87228 100644 --- a/kustomize/preprod/patch-transform-libreoffice.yaml +++ b/kustomize/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 b/kustomize/base/patch-transform-misc.yaml similarity index 57% rename from kustomize/preprod/patch-transform-misc.yaml rename to kustomize/base/patch-transform-misc.yaml index 58b0f3c..c7b5611 100644 --- a/kustomize/preprod/patch-transform-misc.yaml +++ b/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/base/values703.yaml b/kustomize/base/values703.yaml index d37ff22..abb37a1 100644 --- 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 new file mode 100644 index 0000000..8e9a9e6 --- /dev/null +++ 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 index 9625ecc..2630a5e 100644 --- a/kustomize/preprod/kustomization.yaml +++ b/kustomize/preprod/kustomization.yaml @@ -3,18 +3,10 @@ kind: Kustomization resources: - ../base + - alf-prop-config-map.yaml 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 index 3ec98b6..1deb375 100644 --- 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 index 34b3ff0..7ff5f4e 100644 --- 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 index 2f22313..d896720 100644 --- 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 deleted file mode 100644 index 7c071b1..0000000 --- a/kustomize/preprod/patch-live-indexing-content.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 2696c33..0000000 --- a/kustomize/preprod/patch-live-indexing-mediation.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 107f989..0000000 --- a/kustomize/preprod/patch-live-indexing-metadata.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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-router.yaml b/kustomize/preprod/patch-router.yaml deleted file mode 100644 index 5fccf66..0000000 --- a/kustomize/preprod/patch-router.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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/values.yaml b/kustomize/preprod/values.yaml index 2babfb0..087760a 100644 --- a/kustomize/preprod/values.yaml +++ b/kustomize/preprod/values.yaml @@ -29,16 +29,28 @@ 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: + 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: diff --git a/tools/utils/Dockerfile b/tools/utils/Dockerfile index f6ae61f..e859b34 100644 --- a/tools/utils/Dockerfile +++ b/tools/utils/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bookworm-slim # Install utils -RUN apt-get update && apt-get install -y curl jq +RUN apt-get update && apt-get install -y curl jq awscli # Create a non-root user and set the home directory RUN useradd -u 999 -ms /bin/bash job