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

WX-833 Turn on DRS in Cromwell on Azure, add Martha URL to config #127

Merged
merged 7 commits into from
Nov 22, 2022
Merged

WX-833 Turn on DRS in Cromwell on Azure, add Martha URL to config #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64fcaa1
Turn on DRS in Cromwell on Azure, add Martha URL to config
jgainerdewar Nov 21, 2022
6907ffb
RIP Martha
jgainerdewar Nov 21, 2022
5651504
RIP Martha here too
jgainerdewar Nov 21, 2022
8eaf5f9
Merge branch 'main' into jgd_WX-833_azuredrs
jgainerdewar Nov 21, 2022
50407b6
Also update values template
jgainerdewar Nov 21, 2022
3cadc4c
Adjust TES values to enable DRS
jgainerdewar Nov 22, 2022
a53bfe2
Merge branch 'jgd_WX-833_azuredrs' of github.com:broadinstitute/cromw…
jgainerdewar Nov 22, 2022
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 coa-helm/local_values.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ config:
cosmosDbAccountName: "UNDEFINED"
batchAccountName: "UNDEFINED"
batchNodesSubnetId: "UNDEFINED"
drsUrl: "UNDEFINED"

relaylistener:
samResourceId: "UNDEFINED"
Expand Down
5 changes: 5 additions & 0 deletions coa-helm/templates/cromwell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ data:
}

filesystems {
drs.global.config.martha.url = "{{ .Values.config.drsUrl }}"
blob {
class = "cromwell.filesystems.blob.BlobPathBuilderFactory"
global {
Expand All @@ -101,6 +102,10 @@ data:
container: "{{ .Values.persistence.blobContainer }}"
endpoint: "https://{{ .Values.persistence.storageAccount }}.blob.core.windows.net"
}
drs {
rtitle marked this conversation as resolved.
Show resolved Hide resolved
enabled: true
auth: "azure"
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions coa-helm/templates/tes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ spec:
value: {{ .Values.config.dockerInDockerImageName }}
- name: UsePreemptibleVmsOnly
value: {{ .Values.config.usePreemptibleVmsOnly | quote}}
- name: MarthaUrl
value: {{ .Values.config.drsUrl }}
- name: CromwellDrsLocalizerImageName
value: {{ .Values.cromwell.image | replace "cromwell" "cromwell-drs-localizer" }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that DRS resolution in TES isn't tested yet because TES is not working in the app.

image: {{ .Values.tes.image }}
name: tes
ports:
Expand Down
1 change: 1 addition & 0 deletions coa-helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
disableBatchScheduling: false
dockerInDockerImageName: ""
usePreemptibleVmsOnly: false
drsUrl: RUNTIME_PARAMETER

tes:
image: mcr.microsoft.com/cromwellonazure/tes:3.1
Expand Down