Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CC helm chart syntax #2863

Merged
merged 12 commits into from
Apr 18, 2024
Merged

Fix CC helm chart syntax #2863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
717e207
update _alembicdb.tpl: add a closing "end" tag
lisac Apr 17, 2024
663ef79
experiment: what happens if we don't include the postgres and alembic…
lisac Apr 17, 2024
c72bebd
bring in dbClient.envVars rather than singling out postgresUrl
lisac Apr 17, 2024
f88a575
experiment: attempt a dry-run first; and increase wait time
lisac Apr 17, 2024
b188635
fix syntax for setting timeout
lisac Apr 17, 2024
b18d62f
experiment: hard-code a value instead of referencing global variable
lisac Apr 18, 2024
ec2a6e0
experiment, cont'd: hard-code the value in another spot, too
lisac Apr 18, 2024
056e689
fix fatal error i introduced - wasn't re-using HELM_ARGS
lisac Apr 18, 2024
0158f1e
undo experiment of hard-coding variables.
lisac Apr 18, 2024
14a679e
revert script to its state in the default branch
lisac Apr 18, 2024
6bb3e32
re-order env variable imports
lisac Apr 18, 2024
095c76e
Merge branch 'develop' into lisac/cc-helm
lisac Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion helm/domain-cc/templates/_alembicdb.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
name: domain-cc-db
key: DOMAIN_CC_PW
- name: ALEMBIC_SCHEMA
value: {{ .Values.global.service.db.domainCcSchemaName }}
value: {{ .Values.global.service.db.domainCcSchemaName }}
{{- end }}
2 changes: 1 addition & 1 deletion helm/domain-cc/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ spec:
name: http
env:
{{- include "vro.commonEnvVars" . | nindent 12 }}
{{- include "vro.dbClient.envVars" . | nindent 12 }}
{{- include "vro.mqClient.envVars" . | nindent 12 }}
{{- include "vro.redisClient.envVars" . | nindent 12 }}
{{- include "domainCc.alembic.envVars" . | nindent 12 }}
{{- include "vro.postgresUrl" . | nindent 12 }}
resources:
requests:
cpu: 150m
Expand Down