From 92593e1c245c0e3aa9bcd42ce34e296f62bb115f Mon Sep 17 00:00:00 2001 From: Blair L Murri Date: Wed, 15 May 2024 12:14:01 -0700 Subject: [PATCH 1/3] Update k8s VmSize --- src/deploy-cromwell-on-azure/Configuration.cs | 2 +- src/deploy-cromwell-on-azure/Deployer.cs | 2 +- src/ga4gh-tes | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/deploy-cromwell-on-azure/Configuration.cs b/src/deploy-cromwell-on-azure/Configuration.cs index a48b8104..6a623067 100644 --- a/src/deploy-cromwell-on-azure/Configuration.cs +++ b/src/deploy-cromwell-on-azure/Configuration.cs @@ -38,7 +38,7 @@ public abstract class UserAccessibleConfiguration public string SubscriptionId { get; set; } public string RegionName { get; set; } public string MainIdentifierPrefix { get; set; } = "coa"; - public string VmSize { get; set; } = "Standard_D4s_v3"; + public string VmSize { get; set; } = "Standard_D4s_v5"; public string VnetAddressSpace { get; set; } = "10.1.0.0/16"; // 10.1.0.0 - 10.1.255.255, 65536 IPs // Address space for CoA services. public string VmSubnetAddressSpace { get; set; } = "10.1.0.0/24"; // 10.1.0.0 - 10.1.0.255, 256 IPs diff --git a/src/deploy-cromwell-on-azure/Deployer.cs b/src/deploy-cromwell-on-azure/Deployer.cs index d48a3a8a..679d4301 100644 --- a/src/deploy-cromwell-on-azure/Deployer.cs +++ b/src/deploy-cromwell-on-azure/Deployer.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. using System; -using System.ClientModel.Primitives; using System.Collections.Generic; using System.Diagnostics; using System.IdentityModel.Tokens.Jwt; @@ -165,6 +164,7 @@ await Execute("Connecting to Azure Services...", async () => }); await ValidateSubscriptionAndResourceGroupAsync(configuration); + await ValidateVmAsync(); kubernetesManager = new KubernetesManager(configuration, azureCredentials, azureCloudConfig, cts.Token); IResourceGroup resourceGroup = null; diff --git a/src/ga4gh-tes b/src/ga4gh-tes index 4a5c196b..bebd05cd 160000 --- a/src/ga4gh-tes +++ b/src/ga4gh-tes @@ -1 +1 @@ -Subproject commit 4a5c196b5f6a0f18e350aba0f450bd515fc34446 +Subproject commit bebd05cd10e48cdcd7617b49acdb5b33f0a89575 From 6cd5618cb601702270cfb23c6653413338b38764 Mon Sep 17 00:00:00 2001 From: Blair L Murri Date: Wed, 15 May 2024 17:09:38 -0700 Subject: [PATCH 2/3] fix build break --- src/deploy-cromwell-on-azure/Deployer.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/deploy-cromwell-on-azure/Deployer.cs b/src/deploy-cromwell-on-azure/Deployer.cs index 679d4301..88524be4 100644 --- a/src/deploy-cromwell-on-azure/Deployer.cs +++ b/src/deploy-cromwell-on-azure/Deployer.cs @@ -897,13 +897,6 @@ private async Task ProvisionManagedClust return await Execute( $"Creating AKS Cluster: {configuration.AksClusterName}...", async () => (await resourceGroup.GetContainerServiceManagedClusters().CreateOrUpdateAsync(Azure.WaitUntil.Completed, configuration.AksClusterName, cluster, cts.Token)).Value); - - static UserAssignedIdentity PopulateUserAssignedIdentity(UserAssignedIdentityData data) - { - UserAssignedIdentityJson json = new(data.PrincipalId.Value, data.ClientId.Value); - System.Text.Json.Utf8JsonReader reader = new(System.Text.Encoding.UTF8.GetBytes(System.Text.Json.JsonSerializer.Serialize(json, jsonSerializerWebOptions))); - return ((IJsonModel)new UserAssignedIdentity()).Create(ref reader, ModelReaderWriterOptions.Json); - } } private static readonly System.Text.Json.JsonSerializerOptions jsonSerializerWebOptions = new(System.Text.Json.JsonSerializerDefaults.Web); From 120c8e4b78fd403ac2b0f20cc67b35950dfc2f54 Mon Sep 17 00:00:00 2001 From: Blair L Murri Date: Thu, 16 May 2024 14:49:56 -0700 Subject: [PATCH 3/3] corrections --- src/deploy-cromwell-on-azure/Configuration.cs | 2 +- src/deploy-cromwell-on-azure/Deployer.cs | 2 +- src/ga4gh-tes | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/deploy-cromwell-on-azure/Configuration.cs b/src/deploy-cromwell-on-azure/Configuration.cs index 6a623067..70842edb 100644 --- a/src/deploy-cromwell-on-azure/Configuration.cs +++ b/src/deploy-cromwell-on-azure/Configuration.cs @@ -38,7 +38,7 @@ public abstract class UserAccessibleConfiguration public string SubscriptionId { get; set; } public string RegionName { get; set; } public string MainIdentifierPrefix { get; set; } = "coa"; - public string VmSize { get; set; } = "Standard_D4s_v5"; + public string VmSize { get; set; } = "Standard_D4s_v4"; public string VnetAddressSpace { get; set; } = "10.1.0.0/16"; // 10.1.0.0 - 10.1.255.255, 65536 IPs // Address space for CoA services. public string VmSubnetAddressSpace { get; set; } = "10.1.0.0/24"; // 10.1.0.0 - 10.1.0.255, 256 IPs diff --git a/src/deploy-cromwell-on-azure/Deployer.cs b/src/deploy-cromwell-on-azure/Deployer.cs index 88524be4..af0703f9 100644 --- a/src/deploy-cromwell-on-azure/Deployer.cs +++ b/src/deploy-cromwell-on-azure/Deployer.cs @@ -164,7 +164,6 @@ await Execute("Connecting to Azure Services...", async () => }); await ValidateSubscriptionAndResourceGroupAsync(configuration); - await ValidateVmAsync(); kubernetesManager = new KubernetesManager(configuration, azureCredentials, azureCloudConfig, cts.Token); IResourceGroup resourceGroup = null; @@ -364,6 +363,7 @@ await Execute("Connecting to Azure Services...", async () => } ValidateRegionName(configuration.RegionName); + await ValidateVmAsync(); ValidateMainIdentifierPrefix(configuration.MainIdentifierPrefix); storageAccount = await ValidateAndGetExistingStorageAccountAsync(); batchAccount = await ValidateAndGetExistingBatchAccountAsync(); diff --git a/src/ga4gh-tes b/src/ga4gh-tes index b81eb452..3cc7747b 160000 --- a/src/ga4gh-tes +++ b/src/ga4gh-tes @@ -1 +1 @@ -Subproject commit b81eb452e6a0513ab34fc4d63f5adbd0a5bcea20 +Subproject commit 3cc7747b9b3acabc7058b41c24f80f48faed2b70