Skip to content

Commit

Permalink
update all envs for new chart
Browse files Browse the repository at this point in the history
  • Loading branch information
georgepstaylor committed Jan 8, 2025
1 parent eaf9069 commit 6b1bb21
Show file tree
Hide file tree
Showing 30 changed files with 6,883 additions and 108 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
templated/
kustomize/base/charts/
kustomize/**/charts/
kustomize/**/output.yaml
kustomize/**/helm_rendered_spec.yaml
kustomize/**/kustomized_helm_rendered_spec.yaml
kustomize/base/resources.yaml
jobs/reindex/values-reindex-*.yaml
completed.txt
Expand Down
25 changes: 23 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ vars:
ENV: "{{.ENV}}"
FROM: "{{.FROM}}"
TO: "{{.TO}}"
FORCE: "{{.FORCE}}"
NAMESPACE:
sh: if [ "{{.ENV}}" = "poc" ]; then echo "hmpps-delius-alfrsco-{{.ENV}}"; else echo "hmpps-delius-alfresco-{{.ENV}}"; fi
sh: |
if [ -z "{{.ENV}}" ]; then
echo "ERROR: ENV variable is not set" >&2
exit 1
elif [ "{{.ENV}}" = "poc" ]; then
echo "hmpps-delius-alfrsco-{{.ENV}}"
else
echo "hmpps-delius-alfresco-{{.ENV}}"
fi
BUCKET_NAME:
sh: kubectl get secret s3-bucket-output -n {{.NAMESPACE}} -o jsonpath='{.data.BUCKET_NAME}' | base64 --decode
OPEN_SEARCH_PREFIX:
Expand Down Expand Up @@ -90,7 +99,7 @@ tasks:
cmds:
- |
helm upgrade --install alfresco-content-services alfresco/alfresco-content-services --version {{.CHART_VERSION}} --namespace {{.NAMESPACE}} \
--values=../base/values703.yaml --values=../base/values-versions.yaml --values=values.yaml \
--values=../base/values.yaml --values=../base/values-versions.yaml --values=values.yaml \
--set s3connector.config.bucketName={{.BUCKET_NAME}} \
--set database.url={{.RDS_JDBC_URL}} \
--set-string messageBroker.url="{{.MESSAGEBROKER_URL}}" \
Expand Down Expand Up @@ -142,3 +151,15 @@ tasks:
echo "Uninstalling release: $release"
helm uninstall "$release" -n "$NAMESPACE"
done
kubectl_remove_pods_prefix:
vars:
PREFIX: "{{.PREFIX}}"
FORCE_FLAG:
sh: if [ "{{.FORCE}}" = "true" ]; then echo "--force"; else echo ""; fi
cmds:
- |
kubectl get pods -n {{.NAMESPACE}} | grep "^{{.PREFIX}}" | awk '{print $1}' | while IFS= read -r pod; do
echo "Deleting pod: $pod"
kubectl delete pod "$pod" -n "$NAMESPACE" {{.FORCE_FLAG}}
done
10 changes: 5 additions & 5 deletions kustomize/base/values703.yaml → kustomize/base/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ activemq:
nodeSelector: {}
adminUser:
# -- Default username for the embedded broker admin user
user: null
user: admin
# -- Default password for the embedded broker admin user
password: null
password: admin
existingSecretName: amazon-mq-broker-secret
existingSecretName: null
alfresco-connector-ms365:
Expand Down Expand Up @@ -262,7 +262,7 @@ alfresco-transform-service:
# -- Declares the alfresco-shared-file-store used by the content repository
# and transform service
# due to platform constraints, the filestore is in MP
enabled: false
enabled: false
replicaCount: 0
image:
repository: quay.io/alfresco/alfresco-shared-file-store
Expand Down Expand Up @@ -367,7 +367,7 @@ alfresco-search-enterprise:
username: BROKER_USERNAME
password: BROKER_PASSWORD
liveIndexing:
# set in value-versions yaml
# set in value-versions yaml
mediation:
image:
tag: 4.0.0.1
Expand All @@ -385,7 +385,7 @@ alfresco-search-enterprise:
tag: 4.0.0.1
replicaCount: 1
reindexing:
enabled: false # leave as false - reindexing job is now standalone
enabled: false # leave as false - reindexing job is now standalone
repository:
existingConfigMap:
name: *infrastructure_cmName
Expand Down
Loading

0 comments on commit 6b1bb21

Please sign in to comment.