From 1959ec5b206f044290092cee726404aa34a0b530 Mon Sep 17 00:00:00 2001 From: George Taylor Date: Fri, 6 Sep 2024 09:44:13 +0100 Subject: [PATCH] :tada: Tm 142 integrate amazon mq with helm (#101) * :bug: Fix migration helm jobs * :sparkles: Implement ActiveMQ * :tada: add stage environment * fix reindex job * correct names * Update values.yaml * tmp * Update values.yaml --- jobs/reindex/values.yaml | 2 +- kustomize/base/values.yaml | 13 +++++++------ kustomize/stage/patch-ingress-repository.yaml | 6 +++--- kustomize/stage/patch-ingress-share.yaml | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/jobs/reindex/values.yaml b/jobs/reindex/values.yaml index f03d04c..e4ec4e4 100644 --- a/jobs/reindex/values.yaml +++ b/jobs/reindex/values.yaml @@ -40,7 +40,7 @@ messageBroker: # -- Broker password password: null # -- Provide connection details alternatively via an existing secret that contains BROKER_URL, BROKER_USERNAME and BROKER_PASSWORD keys - existingSecretName: acs-alfresco-cs-brokersecret + existingSecretName: amazon-mq-broker-secret global: alfrescoRegistryPullSecrets: quay-registry-secret # -- Shared connections details for Elasticsearch/Opensearch cluster diff --git a/kustomize/base/values.yaml b/kustomize/base/values.yaml index 5f2f0ab..5c7fa2b 100644 --- a/kustomize/base/values.yaml +++ b/kustomize/base/values.yaml @@ -16,7 +16,8 @@ # for performance tuning. repository: # -- Administrator password for ACS in NTLM hash format to set at bootstrap time - adminPassword: "209c6174da490caeb422f3fa5a7ae634" + # will only work on completely fresh database + # adminPassword: "209c6174da490caeb422f3fa5a7ae634" # -- The name of the secret holding the ACS repository license if any. # it must be contained within a `data['*.lic']` property # For details on how to manage license, see: @@ -690,7 +691,7 @@ share: command: [] activemq: nameOverride: activemq - enabled: true + enabled: false resources: requests: cpu: "0.5" @@ -720,10 +721,10 @@ messageBroker: &acs_messageBroker user: null password: null # -- Name of the secret managed by this chart - secretName: &acs_messageBroker_secretName acs-alfresco-cs-brokersecret + # secretName: &acs_messageBroker_secretName amazon-mq-broker-secret # -- Alternatively, provide credentials via an existing secret that contains # BROKER_URL, BROKER_USERNAME and BROKER_PASSWORD keys - existingSecretName: null + existingSecretName: amazon-mq-broker-secret alfresco-elasticsearch-connector: enabled: false alfresco-search: @@ -785,7 +786,7 @@ alfresco-search-enterprise: # -- Enables the embedded elasticsearch cluster enabled: false messageBroker: - existingSecretName: *acs_messageBroker_secretName + existingSecretName: amazon-mq-broker-secret searchIndex: # -- The host where service is available host: null @@ -1076,7 +1077,7 @@ alfresco-sync-service: cpu: "4" memory: "1500Mi" messageBroker: - existingSecretName: *acs_messageBroker_secretName + existingSecretName: amazon-mq-broker-secret repository: nameOverride: alfresco-cs-repository port: *repositoryExternalPort diff --git a/kustomize/stage/patch-ingress-repository.yaml b/kustomize/stage/patch-ingress-repository.yaml index 8af3ed6..72bf8fd 100644 --- a/kustomize/stage/patch-ingress-repository.yaml +++ b/kustomize/stage/patch-ingress-repository.yaml @@ -3,11 +3,11 @@ kind: Ingress 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-test-green + 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" spec: rules: - - host: hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + - host: hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk http: paths: - backend: @@ -26,4 +26,4 @@ spec: pathType: Prefix tls: - hosts: - - hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + - 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 index 7d36bd7..052ebae 100644 --- a/kustomize/stage/patch-ingress-share.yaml +++ b/kustomize/stage/patch-ingress-share.yaml @@ -3,11 +3,11 @@ kind: Ingress 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-test-green + 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" spec: rules: - - host: share.hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + - host: share.hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk http: paths: - backend: @@ -26,5 +26,5 @@ spec: pathType: Prefix tls: - hosts: - - share.hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + - share.hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk secretName: share-ingress-cert