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

Feat: add new config for integrating teamproject and arborist check #2397

Merged
merged 6 commits into from
Oct 27, 2023
Merged

Feat: add new config for integrating teamproject and arborist check #2397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
600e125
feat: add new config for integrating teamproject and arborist check
pieterlukasse Oct 26, 2023
265180a
Merge branch 'master' into feat/new_config_for_integrating_teamprojec…
pieterlukasse Oct 27, 2023
e44193b
feat: add ARBORIST_URL as env var for WebAPI
pieterlukasse Oct 27, 2023
c2a9eff
fix: use ARBORIST_URL in config.yaml
pieterlukasse Oct 27, 2023
a1b9057
feat: add default for ARBORIST_URL
pieterlukasse Oct 27, 2023
c0fc031
revert default value for ARBORIST_URL
pieterlukasse Oct 27, 2023
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: 3 additions & 0 deletions kube/services/ohdsi-webapi/ohdsi-webapi-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ stringData:
security_oauth_callback_api: https://atlas.$hostname/WebAPI/user/oauth/callback
security_oauth_callback_urlResolver: query

security_ohdsi_custom_authorization_mode: teamproject
security_ohdsi_custom_authorization_url: $ARBORIST_URL/auth/mapping

logging_level_root: info
logging_level_org_ohdsi: info
logging_level_org_apache_shiro: info
7 changes: 7 additions & 0 deletions kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ spec:
containers:
- name: ohdsi-webapi
GEN3_OHDSI-WEBAPI_IMAGE|-image: quay.io/cdis/ohdsi-webapi:latest-|
env:
- name: ARBORIST_URL
valueFrom:
configMapKeyRef:
name: manifest-global
key: arborist_url
optional: true
livenessProbe:
httpGet:
path: /WebAPI/info/
Expand Down
Loading