Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9d668e3
Use VM size defaults that Switzerland North offers
JayDoubleu Oct 24, 2026
41c5216
Wrap a long CHANGELOG entry
JayDoubleu Oct 25, 2026
d38e0d1
Use the Ubuntu archive key and HTTPS for the Ubuntu packages
JayDoubleu Oct 25, 2026
cdbb7f0
Create the Gitea storage network rules with the account
JayDoubleu Oct 25, 2026
4a66666
Create the workspace storage network rules with the account
JayDoubleu Oct 25, 2026
2738e4a
Create the Airlock export in-progress network rules with the account
JayDoubleu Oct 25, 2026
c371119
Change the versions of the workspace bundles that use the base
JayDoubleu Oct 25, 2026
54cfeb3
Wrap a long CHANGELOG entry
JayDoubleu Oct 25, 2026
d031de9
Turn off the shell command trace in two Guacamole scripts
JayDoubleu Oct 25, 2026
d1df0fd
Limit the core storage account to its private endpoints
JayDoubleu Oct 27, 2026
4dc93ec
Update the Airlock notifier Logic App in one request
JayDoubleu Oct 27, 2026
c3c3c09
Describe what an earlier notifier does after the core change
JayDoubleu Oct 27, 2026
982ac10
Use one version bump for each component
JayDoubleu Oct 30, 2026
b77258f
Keep the admin VM size on upgrade and add upgrade notes
JayDoubleu Oct 31, 2026
da848a8
Make the guard tests find more forms
JayDoubleu Oct 31, 2026
4dbf84e
Run the guard tests when the files that they read change
JayDoubleu Oct 31, 2026
b07a7f4
Set core 0.19.0 for the core storage change
JayDoubleu Oct 31, 2026
4f6f92b
Find more trace forms and the notifier provider version in the guard …
JayDoubleu Oct 31, 2026
f8ba663
Name the Nexus upgrade and a completed upgrade in the upgrade notes
JayDoubleu Oct 31, 2026
997b3a4
Add a report of VM sizes and their availability in Azure regions
JayDoubleu Nov 1, 2026
c2059b3
Skip database SKUs that a tier label maps in the VM size report
JayDoubleu Nov 1, 2026
0aa2ea1
Run the VM size report on a branch push that changes VM sizes
JayDoubleu Nov 1, 2026
db34bc6
Fix six points in the VM size report and its workflow
JayDoubleu Nov 1, 2026
0771c9d
Run the VM size report on ubuntu-26.04 and allow the label in actionlint
JayDoubleu Nov 1, 2026
f9e3adb
Fix three points in the VM size report and the trace guard
JayDoubleu Nov 1, 2026
019a77f
Run the VM size report by hand only
JayDoubleu Nov 1, 2026
db5374c
Find lowercase VM sizes and ignore set -x in comments and quoted text
JayDoubleu Nov 1, 2026
cbbc4a1
Read quotes and comments as the shell does in the trace guard
JayDoubleu Nov 1, 2026
0ac9074
Keep quoted and escaped separators as words in the trace guard
JayDoubleu Nov 1, 2026
2ccfc6c
Add the issue and pull request links to the new CHANGELOG entries
JayDoubleu Nov 1, 2026
aff8f69
Describe the values that earlier Guacamole versions wrote to their logs
JayDoubleu Nov 1, 2026
77e8b32
Link the new issues in the CHANGELOG entries
JayDoubleu Nov 1, 2026
18912ac
Say that the admin VM size applies only at install, and give a rollba…
JayDoubleu Nov 1, 2026
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
2 changes: 1 addition & 1 deletion .github/actions/devcontainer_run_command/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ runs:
-e UI_SITE_NAME="${{ inputs.UI_SITE_NAME }}" \
-e UI_FOOTER_TEXT="${{ inputs.UI_FOOTER_TEXT }}" \
-e TF_VAR_resource_processor_vmss_sku="${{ (inputs.RESOURCE_PROCESSOR_VMSS_SKU != ''
&& inputs.RESOURCE_PROCESSOR_VMSS_SKU) || 'Standard_B2s' }}" \
&& inputs.RESOURCE_PROCESSOR_VMSS_SKU) || 'Standard_B2ls_v2' }}" \
-e TF_VAR_resource_processor_number_processes_per_instance="${{ (inputs.RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE != ''
&& inputs.RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE) || 5 }}" \
-e FIREWALL_SKU=${{ inputs.FIREWALL_SKU != '' && inputs.FIREWALL_SKU || 'Standard' }} \
Expand Down
6 changes: 6 additions & 0 deletions .github/linters/actionlint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
---
# actionlint v1.7.12 does not yet recognise this GitHub-hosted runner label.
# https://github.com/rhysd/actionlint/issues/682
self-hosted-runner:
labels:
- ubuntu-26.04

# GitHub supports queue: max, but actionlint v1.7.12 does not recognise it.
# https://github.com/rhysd/actionlint/issues/687
# Remove these exact parser exceptions when actionlint supports queue.
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/build_validation_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ jobs:
- 'devops/scripts/destroy_ci_ref_env.py'
- 'devops/scripts/destroy_env_no_terraform.sh'
- 'devops/scripts/validate_ci_cleanup.py'
- 'devops/scripts/vm_size_report.py'
- 'devops/scripts/vm_size_catalogue.txt'
- 'devops/scripts/kv_add_network_exception.sh'
- 'core/terraform/deploy.sh'
- 'core/terraform/mgmt_storage_private_endpoint.sh'
Expand All @@ -101,6 +103,13 @@ jobs:
- '.github/workflows/build_validation_develop.yml'
- '.github/workflows/clean_validation_envs.yml'

# test_core_storage_network.py, test_storage_network_rules.py
# and test_template_scripts.py read these files.
template_files:
- 'core/terraform/storage.tf'
- 'templates/**/*.tf'
- 'templates/**/*.sh'

terraform_core:
- core/**/terraform/**/*.tf

Expand Down Expand Up @@ -141,6 +150,12 @@ jobs:
if: ${{ steps.filter.outputs.ci_cleanup == 'true' }}
run: python3 -m unittest discover -s devops/tests -v

- name: Test template files
if: ${{ steps.filter.outputs.template_files == 'true' && steps.filter.outputs.ci_cleanup != 'true' }}
run: |
python3 -m unittest -v devops/tests/test_core_storage_network.py \
devops/tests/test_storage_network_rules.py devops/tests/test_template_scripts.py

- name: Test core outputs in the development-container base
if: ${{ steps.filter.outputs.ci_cleanup == 'true' }}
# Bookworm provides jq 1.6; the hosted runner has a newer jq version.
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/e2e_helper_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ on: # yamllint disable-line rule:truthy
# test_azure_monitor_contract.py reads these Terraform files.
- 'core/terraform/azure-monitor/**'
- 'templates/workspaces/base/terraform/azure-monitor/**'
# test_vm_size_defaults.py reads these files.
- 'core/terraform/variables.tf'
- 'config.sample.yaml'
- '.github/actions/devcontainer_run_command/action.yml'
- 'docs/tre-admins/environment-variables.md'
- 'docs/tre-admins/setup-instructions/cicd-pre-deployment-steps.md'
- 'docs/tre-admins/setup-instructions/workflows.md'
- 'templates/**/template_schema.json'
- 'templates/shared_services/sonatype-nexus-vm/terraform/variables.tf'
- '.github/workflows/e2e_helper_tests.yml'

permissions:
Expand Down
108 changes: 108 additions & 0 deletions .github/workflows/vm_size_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
---
name: VM Size Availability

on: # yamllint disable-line rule:truthy
workflow_dispatch:
inputs:
region:
description: >-
Region: the Azure region to check. ci-location is the LOCATION variable of the CICD environment.
Select none to check only the regions in More regions.
type: choice
default: ci-location
options:
- ci-location
- switzerlandnorth
- switzerlandwest
- uksouth
- ukwest
- westeurope
- northeurope
- swedencentral
- norwayeast
- germanywestcentral
- francecentral
- italynorth
- polandcentral
- spaincentral
- eastus
- eastus2
- centralus
- westus2
- westus3
- canadacentral
- australiaeast
- japaneast
- southeastasia
- centralindia
- southafricanorth
- brazilsouth
- uaenorth
- none
more_regions:
description: "More regions: other Azure regions to check, separated by commas. For example uksouth,eastus2"
type: string
required: false
default: ""

permissions:
contents: read

jobs:
report:
name: Report VM size availability
runs-on: ubuntu-26.04
# The federated credential of the CI identity trusts this environment.
environment: CICD
Comment thread
JayDoubleu marked this conversation as resolved.
Resolved
timeout-minutes: 15
permissions:
contents: read
# Log in to Azure with OIDC.
id-token: write
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
with:
persist-credentials: false

- name: Azure Login
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
environment: ${{ vars.AZURE_ENVIRONMENT || secrets.AZURE_ENVIRONMENT || 'AzureCloud' }}

- name: Report VM size availability
env:
REGION: ${{ inputs.region }}
MORE_REGIONS: ${{ inputs.more_regions }}
CI_LOCATION: ${{ vars.LOCATION }}
LINK_BASE: ${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}
run: |
case "$REGION" in
none) regions="$MORE_REGIONS" ;;
ci-location)
if [ -z "$CI_LOCATION" ]; then
echo "::error::The CICD environment has no LOCATION variable. Select a region."
exit 1
fi
regions="$CI_LOCATION,$MORE_REGIONS"
;;
*) regions="$REGION,$MORE_REGIONS" ;;
esac
if [ -z "${regions//[, ]/}" ]; then
echo "::error::Select a region, or type one or more regions in More regions."
exit 1
fi
# The artifact is public on a public repository, so keep subscription data out of the report.
python3 devops/scripts/vm_size_report.py --region "$regions" --hide-subscription \
--link-base "$LINK_BASE" --output vm-size-report.md
cat vm-size-report.md >> "$GITHUB_STEP_SUMMARY"

- name: Upload the report
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
with:
name: vm-size-report
path: vm-size-report.md
if-no-files-found: error
retention-days: 7
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
Setting to `false` will delete existing airlock storage accounts and must only be done once all workspaces use the v2 airlock. ([#5048](https://github.com/microsoft/AzureTRE/pull/5048))
* `tre-workspace-service-gitea` 2.0.0 keeps the Git repositories on its file share. The upgrade restarts the web app, so the repositories on the container disk are lost.
Mirror the repositories before the upgrade, and rotate the workspace client secret after it. See the [Gitea upgrade steps](docs/tre-templates/workspace-services/gitea.md#upgrading-to-version-200). The upgrade needs a [force version update](docs/tre-admins/upgrading-resources.md#force-version-update). ([#5283](https://github.com/microsoft/AzureTRE/issues/5283))
* If the Airlock notifier shared service is installed, upgrade it to 1.0.15 directly after the upgrade to `core` 0.19.0. Azure mounts the content share of earlier notifier versions over the public network, which the core storage account no longer accepts.
A running notifier can continue to work, but a restart or a configuration change of its Logic App can fail until the upgrade. See [Airlock notifier](docs/tre-templates/shared-services/airlock-notifier.md#storage-and-network).
Also upgrade the Sonatype Nexus shared service to 3.11.5. Earlier versions keep the boot diagnostics of the Nexus VM in the core storage account. Until the upgrade, the boot diagnostics view of that VM does not load from outside the virtual network. ([#5294](https://github.com/microsoft/AzureTRE/issues/5294))

ENHANCEMENTS:
* Register the OpenAI bundle for branch validation, add GPT-5.1 as the default model and check regional model and quota prerequisites before its private lifecycle test. (`tre-workspace-service-openai` 1.1.0) ([#5150](https://github.com/microsoft/AzureTRE/issues/5150))
Expand Down Expand Up @@ -34,6 +37,7 @@ See [Legacy Airlock & migration](docs/azure-tre-overview/airlock.md#legacy-airlo
* Update template schemas to Draft 2020-12, preserve legacy input restrictions, and support local schema definitions in resource forms. (`API` 0.27.0, `ui` 0.9.0) ([#5005](https://github.com/microsoft/AzureTRE/pull/5005))
* Add weekly and manual builds for Dockerfiles and Porter bundles, with selected pull request builds. Retry a failed target once and report final results. ([#5088](https://github.com/microsoft/AzureTRE/issues/5088))
* Let a fork run CI in a shared subscription with the `CI_ENV_PREFIX` variable and a `ci_repository` tag, which scope cleanup and destruction. Keep a CI environment, for example for a demo, with a `ci_keep_until` tag. (`core` 0.18.15, `devops` 0.7.0, `build-scripts` 1.1.5) ([#5272](https://github.com/microsoft/AzureTRE/pull/5272))
* Report the VM sizes that the repository uses and their availability in one or more Azure regions, for VMs and Azure ML compute, with `devops/scripts/vm_size_report.py` or the **VM Size Availability** workflow. See [VM size availability](docs/tre-admins/vm-size-availability.md). (`devops` 0.8.0) ([#5289](https://github.com/microsoft/AzureTRE/issues/5289))

BUG FIXES:
* Update Nexus from 3.94.0 to 3.94.3. The Nexus 3.94.3 image stops trusting the eMudhra certificate chains that Sonatype reports as compromised. (`tre-shared-service-sonatype-nexus` 3.11.3) ([#5276](https://github.com/microsoft/AzureTRE/issues/5276))
Expand All @@ -56,6 +60,23 @@ BUG FIXES:
The workspace start script gives the OIDC source the current client secret at each start, and it stops Gitea one time when the OIDC settings change. The web app reads the client secret through a Key Vault reference. (`tre-workspace-service-gitea` 2.0.0, `tre-shared-service-gitea` 1.2.6) ([#5283](https://github.com/microsoft/AzureTRE/issues/5283))
* Give the Gitea shared service identity the Key Vault role only on the two secrets that its web app reads. It had the role on the whole core Key Vault. (`tre-shared-service-gitea` 1.2.6) ([#5283](https://github.com/microsoft/AzureTRE/issues/5283))
* Give the Nexus VM identity the Key Vault role only on the Nexus admin password and the Nexus TLS certificate. It had the role on the whole core Key Vault. (`tre-shared-service-sonatype-nexus` 3.11.4) ([#5283](https://github.com/microsoft/AzureTRE/issues/5283))
* Change the default VM sizes that Azure does not offer to all subscriptions in all regions, for example Switzerland North. The resource processor and the admin VM use `Standard_B2ls_v2` in place of `Standard_B2s`. Nexus uses `Standard_B2s_v2` in place of `Standard_B2ms`, and `Standard_B4s_v2` is a new choice beside `Standard_B4ms`.
Each new size has the same vCPU count and memory as the old size. If a deployment does not set `resource_processor_vmss_sku`, the next core deployment resizes the resource processor.
If that resize fails, set `resource_processor_vmss_sku` to the size that the deployment used before, for example `Standard_B2s`, or to a size that the [VM size report](docs/tre-admins/vm-size-availability.md) shows as available in the region. Then deploy the core again.
An upgrade keeps the size of an existing admin VM. If a Nexus service has no stored `vm_size`, for example a Nexus from before bundle 3.2.3, the upgrade resizes its VM to `Standard_B2s_v2` and restarts it.
The AML compute instance bundle default is now `Standard_D2_v3`, the same as its schema, because `Standard_DS2_v3` does not exist.
(`core` 0.19.0, `tre-shared-service-admin-vm` 0.5.8, `tre-shared-service-sonatype-nexus` 3.11.5, `tre-user-resource-aml-compute-instance` 0.5.16) ([#5289](https://github.com/microsoft/AzureTRE/issues/5289))
* Make apt on the Guacamole Linux VM use the Ubuntu archive key for the Ubuntu sources from Nexus, and make Nexus get the Ubuntu packages over HTTPS, the same as its other proxies. An upgrade does not change the apt sources of an existing VM. (`tre-service-guacamole-linuxvm` 1.4.10, `tre-shared-service-sonatype-nexus` 3.11.5) ([#5291](https://github.com/microsoft/AzureTRE/issues/5291))
* Create the network rules of the Gitea storage account together with the account. A separate resource set them after the create and changed them again before the delete. An upgrade removes the separate resource from the Terraform state and keeps the rules.
An uninstall uses the installed bundle version, so complete an upgrade of the service first to keep the rules during the uninstall. (`tre-workspace-service-gitea` 2.0.1) ([#5292](https://github.com/microsoft/AzureTRE/issues/5292))
* Create the network rules of the workspace storage account and the Airlock export in-progress storage account together with each account. A separate resource set them after the create and changed them again before the delete. An upgrade removes the separate resource from the Terraform state and keeps the rules.
An uninstall uses the installed bundle version, so complete an upgrade of a workspace and its Gitea services first to keep the rules during the delete.
(`tre-workspace-base` 2.12.5, `tre-workspace-unrestricted` 0.15.4, `tre-workspace-airlock-import-review` 0.18.4) ([#5292](https://github.com/microsoft/AzureTRE/issues/5292))
* Turn off the shell command trace in the Guacamole Linux VM setup script and around the oauth2-proxy start of the Guacamole server. The comment in the setup script says that the trace is for debugging only.
Earlier versions wrote some values of these commands to their logs. See [Command trace in earlier versions](docs/tre-templates/workspace-services/guacamole.md#command-trace-in-earlier-versions). (`tre-service-guacamole-linuxvm` 1.4.10, `tre-service-guacamole` 0.14.8) ([#5293](https://github.com/microsoft/AzureTRE/issues/5293))
* Accept traffic to the core storage account only through its private endpoints and from trusted Azure services. Add private endpoints for the queue and table services, which the Airlock notifier Logic App uses. The Logic App reaches its content share through the virtual network, and Nexus keeps its boot diagnostics in managed storage.
The notifier uses the AzureRM provider 4.57.0, which updates the Logic App in one request with all its app settings.
(`core` 0.19.0, `tre-shared-service-airlock-notifier` 1.0.15, `tre-shared-service-sonatype-nexus` 3.11.5) ([#5294](https://github.com/microsoft/AzureTRE/issues/5294))
* Update `vite` from 7.3.6 to 7.3.7 and the UI Vitest packages from 4.1.11 to 4.1.12 to address security advisories in the development server and the test mocker. (`ui` 0.10.4) ([#5274](https://github.com/microsoft/AzureTRE/pull/5274))
* Update `aiohttp` from 3.14.3 to 3.14.4 in `api_app`, `resource_processor`, and the CLI to address security advisories. (`API` 0.28.7, `resource_processor` 0.13.15, `CLI` 0.2.13) ([#5270](https://github.com/microsoft/AzureTRE/pull/5270))
* Rename a test variable in the E2E polling tests so that CodeQL stops reporting false clear-text logging alerts. ([#5266](https://github.com/microsoft/AzureTRE/pull/5266))
Expand Down
2 changes: 1 addition & 1 deletion config.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tre:
tre_address_space: 10.0.0.0/12

core_app_service_plan_sku: P1v2
resource_processor_vmss_sku: Standard_B2s
resource_processor_vmss_sku: Standard_B2ls_v2
enable_swagger: true
enable_airlock_malware_scanning: true
# WARNING: Disabling legacy airlock deletes all v1 storage accounts and their data on core redeployment.
Expand Down
2 changes: 1 addition & 1 deletion config_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"type": "string"
},
"resource_processor_vmss_sku": {
"description": "VMSS SKU for the Resource Processor scale set (e.g., Standard_B2s).",
"description": "VMSS SKU for the Resource Processor scale set (e.g., Standard_B2ls_v2).",
"type": "string"
},
"user_management_enabled": {
Expand Down
61 changes: 61 additions & 0 deletions core/terraform/storage.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ resource "azurerm_storage_account" "stg" {
# changing this value is destructive, hence attribute is in lifecycle.ignore_changes block below
infrastructure_encryption_enabled = true

# Shared services reach the account through the private endpoints below.
network_rules {
default_action = var.enable_local_debugging ? "Allow" : "Deny"
bypass = ["AzureServices"]
}

dynamic "identity" {
for_each = var.enable_cmk_encryption ? [1] : []
content {
Expand Down Expand Up @@ -87,3 +93,58 @@ resource "azurerm_private_endpoint" "filepe" {
azurerm_private_endpoint.blobpe
]
}

# The Airlock notifier Logic App keeps its runtime state in queues and tables.
resource "azurerm_private_endpoint" "queuepe" {
name = "pe-queue-${var.tre_id}"
location = azurerm_resource_group.core.location
resource_group_name = azurerm_resource_group.core.name
subnet_id = module.network.shared_subnet_id
tags = local.tre_core_tags

lifecycle { ignore_changes = [tags] }

private_dns_zone_group {
name = "private-dns-zone-group-queuecore"
private_dns_zone_ids = [module.network.queue_core_dns_zone_id]
}

private_service_connection {
name = "psc-queuestg-${var.tre_id}"
private_connection_resource_id = azurerm_storage_account.stg.id
is_manual_connection = false
subresource_names = ["queue"]
}

# private endpoints in serial
depends_on = [
azurerm_private_endpoint.filepe
]
}

resource "azurerm_private_endpoint" "tablepe" {
name = "pe-table-${var.tre_id}"
location = azurerm_resource_group.core.location
resource_group_name = azurerm_resource_group.core.name
subnet_id = module.network.shared_subnet_id
tags = local.tre_core_tags

lifecycle { ignore_changes = [tags] }

private_dns_zone_group {
name = "private-dns-zone-group-tablecore"
private_dns_zone_ids = [module.network.table_core_dns_zone_id]
}

private_service_connection {
name = "psc-tablestg-${var.tre_id}"
private_connection_resource_id = azurerm_storage_account.stg.id
is_manual_connection = false
subresource_names = ["table"]
}

# private endpoints in serial
depends_on = [
azurerm_private_endpoint.queuepe
]
}
2 changes: 1 addition & 1 deletion core/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ variable "resource_processor_type" {

variable "resource_processor_vmss_sku" {
type = string
default = "Standard_B2s"
default = "Standard_B2ls_v2"
description = "The SKU of the resource processor VMSS."
}

Expand Down
2 changes: 1 addition & 1 deletion core/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.18.16"
__version__ = "0.19.0"
Loading