Skip to content

Commit 691cf5d

Browse files
authored
Merge pull request #101177 from roygara/headerUpdates
Updates
2 parents 98dd0b1 + 1c47306 commit 691cf5d

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

articles/virtual-machines/linux/disk-encryption.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,18 @@ The following list explains the diagram in even more detail:
5050

5151
To revoke access to customer-managed keys, see [Azure Key Vault PowerShell](https://docs.microsoft.com/powershell/module/azurerm.keyvault/) and [Azure Key Vault CLI](https://docs.microsoft.com/cli/azure/keyvault). Revoking access effectively blocks access to all data in the storage account, as the encryption key is inaccessible by Azure Storage.
5252

53-
### Supported scenarios and restrictions
53+
### Supported regions
5454

55-
For now, only the following scenarios are supported:
56-
57-
- Create a virtual machine (VM) from an Azure Marketplace image and encrypt the OS disk with server-side encryption using customer-managed keys.
58-
- Create a custom image encrypted with server-side encryption and customer-managed keys.
59-
- Create a VM from a custom image and encrypt the OS disk using server-side encryption and customer-managed keys.
60-
- Create data disks encrypted using server-side encryption and customer-managed keys.
61-
- (CLI/PowerShell only) Create snapshots that are encrypted using server-side encryption and customer-managed keys.
62-
- Create virtual machine scale sets that are encrypted with server-side encryption and customer-managed keys.
63-
64-
For now, we also have the following restrictions:
55+
Only the following regions are currently supported:
6556

6657
- Available as a GA offering in the East US, West US 2, and South Central US regions.
6758
- Available as a public preview in the West Central US, East US 2, Canada Central, and North Europe regions.
59+
60+
### Restrictions
61+
62+
For now, customer-managed keys have the following restrictions:
63+
64+
- Only ["soft" and "hard" RSA keys](../../key-vault/about-keys-secrets-and-certificates.md#keys-and-key-types) of size 2080 are supported, no other keys or sizes.
6865
- Disks created from custom images that are encrypted using server-side encryption and customer-managed keys must be encrypted using the same customer-managed keys and must be in the same subscription.
6966
- Snapshots created from disks that are encrypted with server-side encryption and customer-managed keys must be encrypted with the same customer-managed keys.
7067
- Custom images encrypted using server-side encryption and customer-managed keys cannot be used in the shared image gallery.

articles/virtual-machines/windows/disk-encryption.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,23 @@ The following list explains the diagram in even more detail:
5151
To revoke access to customer-managed keys, see [Azure Key Vault PowerShell](https://docs.microsoft.com/powershell/module/azurerm.keyvault/) and [Azure Key Vault CLI](https://docs.microsoft.com/cli/azure/keyvault). Revoking access effectively blocks access to all data in the storage account, as the encryption key is inaccessible by Azure Storage.
5252

5353
### Supported regions
54-
- Available as a GA offering in East US, West US 2, and South Central US.
55-
- Available as a public preview in West Central US, East US 2, Canada Central, and North Europe.
54+
55+
Only the following regions are currently supported:
56+
57+
- Available as a GA offering in the East US, West US 2, and South Central US regions.
58+
- Available as a public preview in the West Central US, East US 2, Canada Central, and North Europe regions.
5659

5760
### Restrictions
5861

59-
For now, we also have the following restrictions:
62+
For now, customer-managed keys have the following restrictions:
6063

64+
- Only ["soft" and "hard" RSA keys](../../key-vault/about-keys-secrets-and-certificates.md#keys-and-key-types) of size 2080 are supported, no other keys or sizes.
6165
- Disks created from custom images that are encrypted using server-side encryption and customer-managed keys must be encrypted using the same customer-managed keys and must be in the same subscription.
6266
- Snapshots created from disks that are encrypted with server-side encryption and customer-managed keys must be encrypted with the same customer-managed keys.
6367
- Custom images encrypted using server-side encryption and customer-managed keys cannot be used in the shared image gallery.
6468
- All resources related to your customer-managed keys (Azure Key Vaults, disk encryption sets, VMs, disks, and snapshots) must be in the same subscription and region.
6569
- Disks, snapshots, and images encrypted with customer-managed keys cannot move to another subscription.
6670
- If you use the Azure portal to create your disk encryption set, you cannot use snapshots for now.
67-
- Only ["soft" and "hard" RSA keys](../../key-vault/about-keys-secrets-and-certificates.md#keys-and-key-types) of size 2080 are supported, no other keys or sizes.
6871

6972
### PowerShell
7073

0 commit comments

Comments
 (0)