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

Remove datasettestinputs from the list of external SAS containers #829

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Remove datasettestinputs from the list of external SAS containers #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72d525d
Remove datasettestinputs from the list of external SAS containers
BMurri Nov 4, 2024
1bf4dbf
Remove sasToken from datasettestinputs
BMurri Nov 4, 2024
f8c045a
Remove datasettestinputs from the list of external SAS containers
BMurri Nov 5, 2024
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
14 changes: 11 additions & 3 deletions src/deploy-cromwell-on-azure/KubernetesManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ internal class KubernetesManager
.Handle<WebSocketException>(ex => ex.WebSocketErrorCode == WebSocketError.NotAWebSocket)
.WaitAndRetryAsync(200, retryAttempt => TimeSpan.FromSeconds(5));

private static readonly HashSet<string> testStorageAccounts = new HashSet<string> { "datasettestinputs", "datasettestinputssouthc" };

// "master" is used despite not being a best practice: https://github.com/kubernetes-sigs/blob-csi-driver/issues/783
private const string BlobCsiDriverGithubReleaseBranch = "master";
private const string BlobCsiDriverGithubReleaseVersion = "v1.24.0";
Expand Down Expand Up @@ -222,11 +220,21 @@ public async Task UpgradeValuesYamlAsync(Azure.ResourceManager.Storage.StorageAc

private static void ProcessHelmValuesUpdates(HelmValues values, Version previousVersion)
{
if (previousVersion < new Version(4, 3))
if (previousVersion is null || previousVersion < new Version(4, 3))
{
values.CromwellContainers = [Deployer.ConfigurationContainerName, Deployer.ExecutionsContainerName, Deployer.LogsContainerName, Deployer.OutputsContainerName];
values.DefaultContainers = [Deployer.InputsContainerName];
}

if (previousVersion is null || previousVersion < new Version(5, 5, 0))
{
var datasettestinputs = values.ExternalSasContainers.SingleOrDefault(container => container.TryGetValue("accountName", out var name) && "datasettestinputs".Equals(name, StringComparison.OrdinalIgnoreCase));

if (datasettestinputs is not null)
{
_ = values.ExternalSasContainers.Remove(datasettestinputs);
}
}
}

public async Task<Dictionary<string, string>> GetAKSSettingsAsync(Azure.ResourceManager.Storage.StorageAccountData storageAccount)
Expand Down
6 changes: 2 additions & 4 deletions src/deploy-cromwell-on-azure/scripts/helm/values-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ externalSasContainers:
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Public example, not confidential")]
sasToken: "si=coa&spr=https&sv=2022-11-02&sr=c&sig=Updk4aRmzWJai%2BhtQaLjNJAVq5jwc5M4frsCBTjIj%2FM%3D"
containerName: dataset
- accountName: datasettestinputs
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Public example, not confidential")]
sasToken: "sv=2018-03-28&sr=c&si=coa&sig=nKoK6dxjtk5172JZfDH116N6p3xTs7d%2Bs5EAUE4qqgM%3D"
containerName: dataset
# - accountName: datasettestinputs
# containerName: dataset
# - accountName: storageAccount
# sasToken: ""
# containerName: test-inputs
Expand Down
Loading