Skip to content

Commit

Permalink
🎉 Tm 142 integrate amazon mq with helm (#101)
Browse files Browse the repository at this point in the history
* 🐛 Fix migration helm jobs

* ✨ Implement ActiveMQ

* 🎉 add stage environment

* fix reindex job

* correct names

* Update values.yaml

* tmp

* Update values.yaml
  • Loading branch information
georgepstaylor authored Sep 6, 2024
1 parent a558f4e commit 1959ec5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion jobs/reindex/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions kustomize/base/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -690,7 +691,7 @@ share:
command: []
activemq:
nameOverride: activemq
enabled: true
enabled: false
resources:
requests:
cpu: "0.5"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions kustomize/stage/patch-ingress-repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
6 changes: 3 additions & 3 deletions kustomize/stage/patch-ingress-share.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

0 comments on commit 1959ec5

Please sign in to comment.