From 64fcaa1a168c330b597d22403705c18314d4f316 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 21 Nov 2022 10:14:43 -0500 Subject: [PATCH 1/5] Turn on DRS in Cromwell on Azure, add Martha URL to config --- coa-helm/templates/cromwell.yaml | 5 +++++ coa-helm/values.yaml | 1 + 2 files changed, 6 insertions(+) diff --git a/coa-helm/templates/cromwell.yaml b/coa-helm/templates/cromwell.yaml index 8c4283ff..b46e70ac 100644 --- a/coa-helm/templates/cromwell.yaml +++ b/coa-helm/templates/cromwell.yaml @@ -78,6 +78,7 @@ data: } filesystems { + drs.global.config.martha.url = "{{ .Values.config.marthaUrl }}" blob { class = "cromwell.filesystems.blob.BlobPathBuilderFactory" global { @@ -101,6 +102,10 @@ data: container: "{{ .Values.persistence.blobContainer }}" endpoint: "https://{{ .Values.persistence.storageAccount }}.blob.core.windows.net" } + drs { + enabled: true + auth: "azure" + } } } diff --git a/coa-helm/values.yaml b/coa-helm/values.yaml index 766aeab2..e6447be9 100644 --- a/coa-helm/values.yaml +++ b/coa-helm/values.yaml @@ -11,6 +11,7 @@ disableBatchScheduling: false dockerInDockerImageName: "" usePreemptibleVmsOnly: false + marthaUrl: RUNTIME_PARAMETER tes: image: mcr.microsoft.com/cromwellonazure/tes:3.1 From 6907ffbb13249e9c4141877dde37b171391b13c4 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 21 Nov 2022 13:40:51 -0500 Subject: [PATCH 2/5] RIP Martha --- coa-helm/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coa-helm/values.yaml b/coa-helm/values.yaml index e6447be9..7ebf7ed6 100644 --- a/coa-helm/values.yaml +++ b/coa-helm/values.yaml @@ -11,7 +11,7 @@ disableBatchScheduling: false dockerInDockerImageName: "" usePreemptibleVmsOnly: false - marthaUrl: RUNTIME_PARAMETER + drsUrl: RUNTIME_PARAMETER tes: image: mcr.microsoft.com/cromwellonazure/tes:3.1 From 5651504c30a5a2a7480e7bb804ac547a5ce0b03a Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 21 Nov 2022 13:46:01 -0500 Subject: [PATCH 3/5] RIP Martha here too --- coa-helm/templates/cromwell.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coa-helm/templates/cromwell.yaml b/coa-helm/templates/cromwell.yaml index b46e70ac..eb69a412 100644 --- a/coa-helm/templates/cromwell.yaml +++ b/coa-helm/templates/cromwell.yaml @@ -78,7 +78,7 @@ data: } filesystems { - drs.global.config.martha.url = "{{ .Values.config.marthaUrl }}" + drs.global.config.martha.url = "{{ .Values.config.drsUrl }}" blob { class = "cromwell.filesystems.blob.BlobPathBuilderFactory" global { From 50407b67308430694cc8920ca108f707e9086b2d Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 21 Nov 2022 14:06:50 -0500 Subject: [PATCH 4/5] Also update values template --- coa-helm/local_values.template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/coa-helm/local_values.template.yaml b/coa-helm/local_values.template.yaml index d79c99e9..7a4af58e 100644 --- a/coa-helm/local_values.template.yaml +++ b/coa-helm/local_values.template.yaml @@ -9,6 +9,7 @@ config: cosmosDbAccountName: "UNDEFINED" batchAccountName: "UNDEFINED" batchNodesSubnetId: "UNDEFINED" + drsUrl: "UNDEFINED" relaylistener: samResourceId: "UNDEFINED" From 3cadc4c8fefa42aecd10202405b81386ab00b027 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Tue, 22 Nov 2022 16:55:20 -0500 Subject: [PATCH 5/5] Adjust TES values to enable DRS --- coa-helm/templates/tes.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coa-helm/templates/tes.yaml b/coa-helm/templates/tes.yaml index d6f70da6..3ac3a52a 100644 --- a/coa-helm/templates/tes.yaml +++ b/coa-helm/templates/tes.yaml @@ -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" }} image: {{ .Values.tes.image }} name: tes ports: