From 47c029617ac8ea9756232ed7db94ba788fa21a22 Mon Sep 17 00:00:00 2001 From: George Taylor Date: Mon, 2 Dec 2024 17:46:41 +0000 Subject: [PATCH] values changes --- kustomize/base/values-versions.yaml | 14 ---------- kustomize/base/values703.yaml | 27 ++++++++++++++++--- .../preprod/patch-ingress-repository.yaml | 2 +- kustomize/preprod/patch-ingress-share.yaml | 2 +- kustomize/preprod/values.yaml | 13 +++------ 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/kustomize/base/values-versions.yaml b/kustomize/base/values-versions.yaml index aec48f2..578608f 100644 --- a/kustomize/base/values-versions.yaml +++ b/kustomize/base/values-versions.yaml @@ -1,16 +1,3 @@ -# This values file can be used to install ACS 7.3.x using the latest version of -# the chart -alfresco-repository: - image: - repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-content-repository - tag: release_7.3.2_elasticsearch-r5.0.1-content-latest -alfresco-ai-transformer: - image: - tag: 1.5.1 -share: - image: - repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-share - tag: release_7.3.2_elasticsearch-r5.0.1-share-latest alfresco-transform-service: transformrouter: image: @@ -40,7 +27,6 @@ alfresco-search: insightEngineImage: tag: 2.0.5.2 alfresco-search-enterprise: - enabled: false liveIndexing: mediation: image: diff --git a/kustomize/base/values703.yaml b/kustomize/base/values703.yaml index 077ea1e..d37ff22 100644 --- a/kustomize/base/values703.yaml +++ b/kustomize/base/values703.yaml @@ -108,7 +108,8 @@ alfresco-repository: -Dsystem.delete_not_exists.read_only=false -Dsystem.delete_not_exists.timeout_seconds=3600 -Dfilecontentstore.subsystem.name=S3 - -Dsfs.url=https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk + CATALINA_OPTS: >- + -Ds3.bucketLocation=eu-west-2 nameOverride: alfresco-repository securityContext: allowPrivilegeEscalation: false @@ -146,8 +147,18 @@ alfresco-repository: - name: alfresco-license key: Alfresco-ent73-NOMSNationalOffenderManagementService-Expires10.03.2025.lic purpose: acs-license - - name: s3-connector-config - purpose: subsystems:ContentStore:S3 + - name: s3-bucket-output + key: ACCESSKEY + purpose: property:s3.accessKey + - name: s3-bucket-output + key: SECRETKEY + purpose: property:s3.secretKey + - name: s3-bucket-output + key: BUCKET_NAME + purpose: property:s3.bucketName + - name: sfs-url + key: SFS_URL + purpose: property:sfs.url db: existingConfigMap: name: *infrastructure_cmName @@ -350,21 +361,29 @@ alfresco-search-enterprise: messageBroker: existingConfigMap: name: *infrastructure_cmName - existingSecretName: amazon-mq-broker-secret + existingSecret: + name: amazon-mq-broker-secret + keys: + username: BROKER_USERNAME + password: BROKER_PASSWORD liveIndexing: # set in value-versions yaml mediation: image: tag: 4.0.0.1 + replicaCount: 1 content: image: tag: 4.0.0.1 + replicaCount: 1 metadata: image: tag: 4.0.0.1 + replicaCount: 1 path: image: tag: 4.0.0.1 + replicaCount: 1 reindexing: enabled: false # leave as false - reindexing job is now standalone repository: diff --git a/kustomize/preprod/patch-ingress-repository.yaml b/kustomize/preprod/patch-ingress-repository.yaml index 7ff5f4e..34b3ff0 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: "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" + nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" 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 d896720..2f22313 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: "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" + nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" spec: rules: - host: share.hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk diff --git a/kustomize/preprod/values.yaml b/kustomize/preprod/values.yaml index 0b78bb3..5fab91d 100644 --- a/kustomize/preprod/values.yaml +++ b/kustomize/preprod/values.yaml @@ -1,5 +1,5 @@ # this file overrides values defined in ./values.yaml -repository: +alfresco-repository: # -- The startup probe to cover the worse case startup time for slow clusters # startupProbe: # periodSeconds: 30 @@ -16,6 +16,7 @@ repository: # failureThreshold: 40 replicaCount: 1 image: + repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-content-repository tag: release_7.3.2_elasticsearch-r5.0.2-content-latest resources: # requests and limits set closer together to ensure CP stability requests: @@ -29,6 +30,7 @@ repository: 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 externalProtocol: https externalPort: 443 @@ -48,15 +50,6 @@ alfresco-transform-service: limits: cpu: "2" memory: "756Mi" -alfresco-search-enterprise: - liveIndexing: - content: - replicaCount: 1 - mediation: - replicaCount: 1 - metadata: - replicaCount: 1 - global: known_urls: - https://hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk