Skip to content

Commit

Permalink
Merge branch 'main' into update-helm-chart-703
Browse files Browse the repository at this point in the history
  • Loading branch information
georgepstaylor committed Jan 2, 2025
2 parents 098625d + efd6a64 commit 83fd4f3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/opensearch-backup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ jobs:
helm install opensearch-backup . \
--set opensearch.environment=${{ matrix.environment || github.event.inputs.environment }}
kubectl wait job/opensearch-backup --for=condition=complete --timeout=1h
kubectl wait job/opensearch-backup --for=condition=complete --timeout=3h
- name: Output job logs
if: always()
run: |
# Get the pod name from the job
POD_NAME=$(kubectl get pods --selector=job-name=opensearch-backup -o jsonpath='{.items[0].metadata.name}')
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=150000000" --set "toId=200000000" --namespace {{.NAMESPACE}}
helm install "reindex-default-$(openssl rand -hex 4)" ./jobs/reindex --set "global.elasticsearch.host={{.OPENSEARCH_HOST}}" --set "fromId=350000000" --set "toId=400000000" --namespace {{.NAMESPACE}}
reindex_list:
cmds:
Expand Down
6 changes: 3 additions & 3 deletions kustomize/preprod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ alfresco-search-enterprise:
replicaCount: 2
alfresco-transform-service:
tika:
replicaCount: 6
replicaCount: 8
resources:
requests:
cpu: "0.5"
memory: "2048Mi"
limits:
cpu: "2"
memory: "4096Mi"
memory: 6Gi
transformrouter:
replicaCount: 8
resources:
Expand All @@ -59,7 +59,7 @@ alfresco-transform-service:
memory: "512Mi"
limits:
cpu: "2"
memory: "1024Mi"
memory: 2Gi
global:
known_urls:
- https://hmpps-delius-alfresco-preprod.apps.live.cloud-platform.service.justice.gov.uk
Expand Down

0 comments on commit 83fd4f3

Please sign in to comment.