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

Jump to bottom

Update to Azure tf config for clean apply #4625

Merged
merged 2 commits into from
Aug 15, 2024
Merged

Update to Azure tf config for clean apply #4625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bcebb6
Fix deprecation warning by using new variable name
sgibson91 Aug 15, 2024
58e5a16
Do not enable cross tenant replication
sgibson91 Aug 15, 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
19 changes: 18 additions & 1 deletion terraform/azure/storage.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ resource "azurerm_storage_account" "homes" {
account_kind = "FileStorage"
account_replication_type = "LRS"

cross_tenant_replication_enabled = false

# Disable 'secure link' because we only want to use NFS
# see https://docs.microsoft.com/en-us/azure/storage/files/storage-files-how-to-mount-nfs-shares#disable-secure-transfer
enable_https_traffic_only = false
https_traffic_only_enabled = false

network_rules {
# Allow NFS access only from our nodes, deny access from all other networks
Expand Down Expand Up @@ -48,6 +50,12 @@ resource "azurerm_recovery_services_vault" "homedir_recovery_vault" {
sku = "Standard"
}

resource "azurerm_backup_container_storage_account" "protection_container" {
resource_group_name = azurerm_resource_group.jupyterhub.name
recovery_vault_name = azurerm_recovery_services_vault.homedir_recovery_vault.name
storage_account_id = azurerm_storage_account.homes.id
}

resource "azurerm_backup_policy_file_share" "backup_policy" {
name = "homedir-recovery-vault-policy"
resource_group_name = azurerm_resource_group.jupyterhub.name
Expand All @@ -64,3 +72,12 @@ resource "azurerm_backup_policy_file_share" "backup_policy" {
count = 5
}
}

resource "azurerm_backup_protected_file_share" "homes_share" {
resource_group_name = azurerm_resource_group.jupyterhub.name
recovery_vault_name = azurerm_recovery_services_vault.homedir_recovery_vault.name
source_storage_account_id = azurerm_backup_container_storage_account.protection_container.storage_account_id
source_file_share_name = azurerm_storage_share.homes.name
backup_policy_id = azurerm_backup_policy_file_share.backup_policy.id
depends_on = [azurerm_backup_container_storage_account.protection_container]
}