Skip to content

Commit de57ab4

Browse files
authored
Merge pull request #271360 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c233888 + c3f5d5f commit de57ab4

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

articles/aks/azure-csi-disk-storage-provision.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ The following table includes parameters you can use to define a custom storage c
4949
|fsType | File System Type | `ext4`, `ext3`, `ext2`, `xfs`, `btrfs` for Linux, `ntfs` for Windows | No | `ext4` for Linux, `ntfs` for Windows|
5050
|cachingMode | [Azure Data Disk Host Cache Setting][disk-host-cache-setting] | `None`, `ReadOnly`, `ReadWrite` | No | `ReadOnly`|
5151
|resourceGroup | Specify the resource group for the Azure Disks | Existing resource group name | No | If empty, driver uses the same resource group name as current AKS cluster|
52-
|DiskIOPSReadWrite | [UltraSSD disk][ultra-ssd-disks] IOPS Capability (minimum: 2 IOPS/GiB) | 100~160000 | No | `500`|
53-
|DiskMBpsReadWrite | [UltraSSD disk][ultra-ssd-disks] Throughput Capability(minimum: 0.032/GiB) | 1~2000 | No | `100`|
52+
|DiskIOPSReadWrite | [UltraSSD disk][ultra-ssd-disks] or [Premium SSD v2][premiumv2_lrs_disks] IOPS Capability (minimum: 2 IOPS/GiB) | 100~160000 | No | `500`|
53+
|DiskMBpsReadWrite | [UltraSSD disk][ultra-ssd-disks] or [Premium SSD v2][premiumv2_lrs_disks] Throughput Capability(minimum: 0.032/GiB) | 1~2000 | No | `100`|
5454
|LogicalSectorSize | Logical sector size in bytes for ultra disk. Supported values are 512 ad 4096. 4096 is the default. | `512`, `4096` | No | `4096`|
5555
|tags | Azure Disk [tags][azure-tags] | Tag format: `key1=val1,key2=val2` | No | ""|
5656
|diskEncryptionSetID | ResourceId of the disk encryption set to use for [enabling encryption at rest][disk-encryption] | format: `/subscriptions/{subs-id}/resourceGroups/{rg-name}/providers/Microsoft.Compute/diskEncryptionSets/{diskEncryptionSet-name}` | No | ""|
@@ -410,6 +410,7 @@ kubectl delete -f azure-pvc.yaml
410410
[disk-host-cache-setting]: ../virtual-machines/windows/premium-storage-performance.md#disk-caching
411411
[use-ultra-disks]: use-ultra-disks.md
412412
[ultra-ssd-disks]: ../virtual-machines/linux/disks-ultra-ssd.md
413+
[premiumv2_lrs_disks]: ../virtual-machines/disks-types.md#premium-ssd-v2
413414
[azure-tags]: ../azure-resource-manager/management/tag-resources.md
414415
[disk-encryption]: ../virtual-machines/windows/disk-encryption.md
415416
[azure-disk-write-accelerator]: ../virtual-machines/windows/how-to-enable-write-accelerator.md

articles/storage/blobs/secure-file-transfer-protocol-support.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ The following clients have compatible algorithm support with SFTP for Azure Blob
177177
- JSCH 0.1.54+
178178
- curl 7.85.0+
179179
- AIX<sup>1</sup>
180+
- MobaXterm v21.3
180181

181182
<sup>1</sup> Must set `AllowPKCS12KeystoreAutoOpen` option to `no`.
182183

0 commit comments

Comments
 (0)