From f1011d266629682ebda3e6357b9d59037a52ac34 Mon Sep 17 00:00:00 2001 From: Blair L Murri Date: Wed, 4 Oct 2023 15:16:01 -0700 Subject: [PATCH 1/2] Set TES global managed identity to be the deployed TES MI --- .../scripts/helm/templates/tes-deployment.yaml | 2 +- src/deploy-cromwell-on-azure/scripts/helm/values-template.yaml | 1 - src/ga4gh-tes | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/deploy-cromwell-on-azure/scripts/helm/templates/tes-deployment.yaml b/src/deploy-cromwell-on-azure/scripts/helm/templates/tes-deployment.yaml index 8f4a341db..1d082d812 100644 --- a/src/deploy-cromwell-on-azure/scripts/helm/templates/tes-deployment.yaml +++ b/src/deploy-cromwell-on-azure/scripts/helm/templates/tes-deployment.yaml @@ -99,7 +99,7 @@ spec: - name: BatchNodes__GlobalStartTask value: {{ .Values.config.batchNodes.globalStartTask }} - name: BatchNodes__GlobalManagedIdentity - value: {{ .Values.config.batchNodes.globalManagedIdentity }} + value: {{ .Values.identity.resourceId }} - name: Storage__ExternalStorageContainers {{- $containers := list -}} {{- range .Values.externalSasContainers }} diff --git a/src/deploy-cromwell-on-azure/scripts/helm/values-template.yaml b/src/deploy-cromwell-on-azure/scripts/helm/values-template.yaml index d8b775029..af12b182a 100644 --- a/src/deploy-cromwell-on-azure/scripts/helm/values-template.yaml +++ b/src/deploy-cromwell-on-azure/scripts/helm/values-template.yaml @@ -14,7 +14,6 @@ config: subnetId: RUNTIME_PARAMETER disablePublicIpAddress: RUNTIME_PARAMETER globalStartTask: /configuration/start-task.sh - globalManagedIdentity: batchScheduling: disable: RUNTIME_PARAMETER usePreemptibleVmsOnly: RUNTIME_PARAMETER diff --git a/src/ga4gh-tes b/src/ga4gh-tes index 5ed6948f3..0585bb47e 160000 --- a/src/ga4gh-tes +++ b/src/ga4gh-tes @@ -1 +1 @@ -Subproject commit 5ed6948f3ad9924f0fa1d23e2c0ad30c113d660f +Subproject commit 0585bb47e580b0b14b3248d399a2730497734fa6 From 53099bcf90481efb4ca39219a16bdbfea100087a Mon Sep 17 00:00:00 2001 From: Blair L Murri Date: Wed, 4 Oct 2023 16:12:50 -0700 Subject: [PATCH 2/2] Update submodule to main --- src/ga4gh-tes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ga4gh-tes b/src/ga4gh-tes index 0585bb47e..2432358e9 160000 --- a/src/ga4gh-tes +++ b/src/ga4gh-tes @@ -1 +1 @@ -Subproject commit 0585bb47e580b0b14b3248d399a2730497734fa6 +Subproject commit 2432358e9fc364baa1c1a8e15106b5ceeb53b43c