Skip to content

Commit

Permalink
new charts require global postgres auth and pw, still need to set FCR…
Browse files Browse the repository at this point in the history
…EPO_DB_PASSWORD in the deploy somehow with v15 of the actions
  • Loading branch information
aprilrieger committed Feb 19, 2024
1 parent b0b72f5 commit 8cae392
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions ops/demo-deploy.tmpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ extraEnvVars: &envVars
- name: FCREPO_BASE_PATH
value: /demo-palni-palci
- name: FCREPO_HOST
value: fcrepo.fcrepo.svc.cluster.local:8080
value: fcrepo.fcrepo.svc.cluster.local
- name: FCREPO_PATH
value: /rest
- name: FCREPO_URL
Expand Down Expand Up @@ -179,6 +179,7 @@ extraEnvVars: &envVars
value: http://admin:[email protected]:8983/solr/

worker:
enabled: true
replicaCount: 1
resources:
limits:
Expand Down Expand Up @@ -249,7 +250,7 @@ extraDeploy:
command:
- sh
- -c
- "db-wait.sh {{ include "hyrax.redis.host" . }}:6379"
- "db-wait.sh {{ include "hyrax.fcrepo.host" . }}:8080"
{{- if .Values.worker.extraInitContainers }}
{{- toYaml .Values.worker.extraInitContainers | nindent 8 }}
{{- end }}
Expand Down Expand Up @@ -398,6 +399,12 @@ externalSolrCollection: demo-palni-palci
externalSolrPassword: $SOLR_ADMIN_PASSWORD

global:
# These global postgresql values are used by the fcrepo chart
postgresql:
auth:
username: fcrepo
password: $FCREPO_DB_PASSWORD
# This is th name of the running rails server pod
hyraxHostName: palni-palci-demo-pals

nginx:
Expand Down

0 comments on commit 8cae392

Please sign in to comment.