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

Add bastion sku configuration #4383

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Add bastion sku configuration #4383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41e97cb
Add bastion sku configuration
marrobi Feb 19, 2025
3f98492
Add `bastion_sku` variable to configuration and documentation
marrobi Feb 19, 2025
8fb4d8f
Fix sku and version
marrobi Feb 19, 2025
7c75346
Fix linting
marrobi Feb 19, 2025
3bf19e0
linting
marrobi Feb 19, 2025
fe098ad
Add network id
marrobi Feb 19, 2025
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
3 changes: 3 additions & 0 deletions config.sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ tre:
# firewall_force_tunnel_ip: __CHANGE_ME__
firewall_sku: Standard
app_gateway_sku: Standard_v2
# See https://learn.microsoft.com/en-us/azure/bastion/bastion-overview#sku
# Set to Basic if wish to connect to VMs in workspaces.
bastion_sku: Developer

# Uncomment to deploy to a custom domain
# custom_domain: __CHANGE_ME__
Expand Down
4 changes: 4 additions & 0 deletions config_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
"description": "SKU of the Application Gateway.",
"type": "string"
},
"bastion_sku": {
"description": "SKU of the Azure Bastion.",
"type": "string"
},
"custom_domain": {
"description": "Custom domain name.",
"type": "string"
Expand Down
3 changes: 2 additions & 1 deletion core/terraform/bastion.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ resource "azurerm_bastion_host" "bastion" {
name = "bas-${var.tre_id}"
resource_group_name = azurerm_resource_group.core.name
location = azurerm_resource_group.core.location
sku = var.bastion_sku
virtual_network_id = module.network.core_vnet_id

ip_configuration {
name = "configuration"
Expand All @@ -24,4 +26,3 @@ resource "azurerm_bastion_host" "bastion" {

lifecycle { ignore_changes = [tags] }
}

6 changes: 6 additions & 0 deletions core/terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,9 @@ variable "encryption_kv_name" {
description = "Name of Key Vault for encryption keys, required only if external_key_store_id is not set (only used if enable_cmk_encryption is true)"
default = null
}

variable "bastion_sku" {
type = string
description = "Azure Bastion SKU"
default = "Developer"
}
2 changes: 1 addition & 1 deletion core/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.12.3"
__version__ = "0.12.4"
1 change: 1 addition & 0 deletions docs/tre-admins/environment-variables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
| `RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE` | Optional. The number of processes to instantiate when the Resource Processor starts. Equates to the number of parallel deployment operations possible in your TRE. Defaults to `5`. |
| `FIREWALL_SKU` | Optional. The SKU of the Azure Firewall instance. Default value is `Standard`. Allowed values [`Basic`, `Standard`, `Premium`]. See [Azure Firewall SKU feature comparison](https://learn.microsoft.com/en-us/azure/firewall/choose-firewall-sku). |
| `APP_GATEWAY_SKU` | Optional. The SKU of the Application Gateway. Default value is `Standard_v2`. Allowed values [`Standard_v2`, `WAF_v2`] |
| `BASTION_SKU` | Optional. The SKU of the Azure Bastion instance. Default value is `Developer`. Allowed values [`Developer`, `Standard`, `Basic`, `Premium`]. See [Azure Bastion SKU feature comparison](https://learn.microsoft.com/en-us/azure/bastion/bastion-overview#sku). |
| `CUSTOM_DOMAIN` | Optional. Custom domain name to access the Azure TRE portal. See [Custom domain name](custom-domain.md). |
| `ENABLE_CMK_ENCRYPTION` | If set to `true`, customer-managed key encryption will be enabled for all supported resources. |
## For authentication in `/config.yaml`
Expand Down
Loading