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

Jump to bottom

Permit passing SQLAlchemy configuration options #892

Merged
merged 2 commits into from
Oct 19, 2024
Merged

Permit passing SQLAlchemy configuration options #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4fe353
Permit passing SQLAlchemy configuration options
ponyisi Oct 18, 2024
5226628
Add documentation for new option
ponyisi Oct 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
1 change: 1 addition & 0 deletions docs/deployment/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ parameters for the [rabbitMQ](https://github.com/bitnami/charts/tree/master/bitn
| `app.defaultDIDFinderScheme` | DID Finder scheme if none provided in request. If left blank, template will attempt to guess. | - |
| `app.validateTransformerImage` | Should docker image name be validated at DockerHub? | `true` |
| `app.defaultUsers` | Name of secret holding json file with default users to create on deployment | - |
| `app.sqlalchemyEngineOptions` | String that will be interpreted as a Python dict, giving keyword arguments to the `sqlalchemy.create_engine()` function for the internal database. | - |
| `didFinder.rucio.enabled` | Should we deploy the Rucio DID Finder? | `true` |
| `didFinder.rucio.image` | Rucio DID Finder image name | `sslhep/servicex-did-finder` |
| `didFinder.rucio.tag` | Rucio DID Finder image tag | `latest` |
Expand Down
5 changes: 4 additions & 1 deletion helm/servicex/templates/app/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ data:
{{ else }}
SQLALCHEMY_DATABASE_URI = 'sqlite:////sqlite/app.db'
{{ end }}

{{ if .Values.app.sqlalchemyEngineOptions }}
# SQLAlchemy engine configuration
SQLALCHEMY_ENGINE_OPTIONS = {{ .Values.app.sqlalchemyEngineOptions }}
{{- end }}
SQLALCHEMY_TRACK_MODIFICATIONS = False
SECRET_KEY = 'some-secret-string'
JWT_SECRET_KEY = 'jwt-secret-string'
Expand Down
1 change: 1 addition & 0 deletions helm/servicex/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ app:
tag: develop
tokenExpires: false
validateTransformerImage: true
sqlalchemyEngineOptions: null

codeGen:
uproot-raw:
Expand Down
Loading