Merge pull request #276500 from lorbichara/azurediskupdates

AnnaMHuff · web-flow · commit 9de2f4cce96a · 2024-05-29T09:51:44.000-06:00
Minor structure updates to the Azure Disks article &amp; prereqs of ACStor
diff --git a/articles/storage/container-storage/use-container-storage-with-elastic-san.md b/articles/storage/container-storage/use-container-storage-with-elastic-san.md
@@ -17,8 +17,6 @@ ms.custom: references_regions
 
 [!INCLUDE [container-storage-prerequisites](../../../includes/container-storage-prerequisites.md)]
 
-- If you haven't already installed Azure Container Storage, follow the instructions in [Install Azure Container Storage](container-storage-aks-quickstart.md).
-
 - Ensure your subscription has [Azure role-based access control (Azure RBAC) Owner](../../role-based-access-control/built-in-roles/general.md#owner) role. For Azure Container Storage to successfully communicate with Elastic SAN's API, it needs special permissions that the Owner role will grant.
 
 > [!NOTE]
diff --git a/articles/storage/container-storage/use-container-storage-with-local-disk.md b/articles/storage/container-storage/use-container-storage-with-local-disk.md
@@ -20,10 +20,6 @@ ms.custom: references_regions
 
 [!INCLUDE [container-storage-prerequisites](../../../includes/container-storage-prerequisites.md)]
 
-- If you haven't already installed Azure Container Storage, follow the instructions in [Install Azure Container Storage](container-storage-aks-quickstart.md).
-
-- Check if your target region is supported in [Azure Container Storage regions](container-storage-introduction.md#regional-availability).
-
 ## Choose a VM type that supports Ephemeral Disk
 
 Ephemeral Disk is only available in certain types of VMs. If you plan to use Ephemeral Disk with local NVMe, a [storage optimized VM](../../virtual-machines/sizes-storage.md) such as **standard_l8s_v3** is required. If you plan to use Ephemeral Disk with temp SSD, a [Ev3 and Esv3-series VM](../../virtual-machines/ev3-esv3-series.md) is required.
diff --git a/articles/storage/container-storage/use-container-storage-with-managed-disks.md b/articles/storage/container-storage/use-container-storage-with-managed-disks.md
@@ -17,25 +17,18 @@ ms.custom: references_regions
 
 [!INCLUDE [container-storage-prerequisites](../../../includes/container-storage-prerequisites.md)]
 
-- If you haven't already installed Azure Container Storage, follow the instructions in [Install Azure Container Storage](container-storage-aks-quickstart.md).
-
 > [!NOTE]
 > To use Azure Container Storage with Azure managed disks, your AKS cluster should have a node pool of at least three [general purpose VMs](../../virtual-machines/sizes-general.md) such as **standard_d4s_v5** for the cluster nodes, each with a minimum of four virtual CPUs (vCPUs).
 
-## Regional availability
-
-[!INCLUDE [container-storage-regions](../../../includes/container-storage-regions.md)]
-
 ## Create a storage pool
 
 First, create a storage pool, which is a logical grouping of storage for your Kubernetes cluster, by defining it in a YAML manifest file.
 
-If you enabled Azure Container Storage using `az aks create` or `az aks update` commands, you might already have a storage pool. Use `kubectl get sp -n acstor` to get the list of storage pools. If you have a storage pool already available that you want to use, you can skip this section and proceed to [Display the available storage classes](#display-the-available-storage-classes). If you have Azure managed disks that are already provisioned, you can [create a pre-provisioned storage pool](#create-a-pre-provisioned-storage-pool) using those disks.
+If you enabled Azure Container Storage using `az aks create` or `az aks update` commands, you might already have a storage pool. Use `kubectl get sp -n acstor` to get the list of storage pools. If you have a storage pool already available that you want to use, you can skip this section and proceed to [Display the available storage classes](#display-the-available-storage-classes).
 
-> [!IMPORTANT]
-> If you want to use your own keys to encrypt your volumes instead of using Microsoft-managed keys, don't create your storage pool using the steps in this section. Instead, go to [Enable server-side encryption with customer-managed keys](#enable-server-side-encryption-with-customer-managed-keys) and follow the steps there.
-
-Follow these steps to create a storage pool for Azure Disks.
+Follow these steps to create a storage pool for Azure Disks. You can also:
+- [Create a storage pool with a pre-provisioned Azure managed disk](#create-a-pre-provisioned-storage-pool)
+- [Create a storage pool that has server-side encryption with customer managed keys enabled](#enable-server-side-encryption-with-customer-managed-keys)
 
 1. Use your favorite text editor to create a YAML manifest file such as `code acstor-storagepool.yaml`.
 
@@ -76,6 +69,115 @@ Follow these steps to create a storage pool for Azure Disks.
 
 When the storage pool is created, Azure Container Storage will create a storage class on your behalf, using the naming convention `acstor-<storage-pool-name>`. Now you can [display the available storage classes](#display-the-available-storage-classes) and [create a persistent volume claim](#create-a-persistent-volume-claim).
 
+## Display the available storage classes
+
+When the storage pool is ready to use, you must select a storage class to define how storage is dynamically created when creating persistent volume claims and deploying persistent volumes.
+
+Run `kubectl get sc` to display the available storage classes. You should see a storage class called `acstor-<storage-pool-name>`.
+
+> [!IMPORTANT]
+> Don't use the storage class that's marked **internal**. It's an internal storage class that's needed for Azure Container Storage to work.
+
+## Create a persistent volume claim
+
+A persistent volume claim (PVC) is used to automatically provision storage based on a storage class. Follow these steps to create a PVC using the new storage class. 
+
+1. Use your favorite text editor to create a YAML manifest file such as `code acstor-pvc.yaml`.
+
+1. Paste in the following code and save the file. The PVC `name` value can be whatever you want.
+
+   ```yml
+   apiVersion: v1
+   kind: PersistentVolumeClaim
+   metadata:
+     name: azurediskpvc
+   spec:
+     accessModes:
+       - ReadWriteOnce
+     storageClassName: acstor-azuredisk # replace with the name of your storage class if different
+     resources:
+       requests:
+         storage: 100Gi
+   ```
+
+1. Apply the YAML manifest file to create the PVC.
+
+   ```azurecli-interactive
+   kubectl apply -f acstor-pvc.yaml
+   ```
+
+   You should see output similar to:
+
+   ```output
+   persistentvolumeclaim/azurediskpvc created
+   ```
+
+   You can verify the status of the PVC by running the following command:
+
+   ```azurecli-interactive
+   kubectl describe pvc azurediskpvc
+   ```
+
+Once the PVC is created, it's ready for use by a pod.
+
+## Deploy a pod and attach a persistent volume
+
+Create a pod using [Fio](https://github.com/axboe/fio) (Flexible I/O Tester) for benchmarking and workload simulation, and specify a mount path for the persistent volume. For **claimName**, use the **name** value that you used when creating the persistent volume claim.
+
+1. Use your favorite text editor to create a YAML manifest file such as `code acstor-pod.yaml`.
+
+1. Paste in the following code and save the file.
+
+   ```yml
+   kind: Pod
+   apiVersion: v1
+   metadata:
+     name: fiopod
+   spec:
+     nodeSelector:
+       acstor.azure.com/io-engine: acstor
+     volumes:
+       - name: azurediskpv
+         persistentVolumeClaim:
+           claimName: azurediskpvc
+     containers:
+       - name: fio
+         image: nixery.dev/shell/fio
+         args:
+           - sleep
+           - "1000000"
+         volumeMounts:
+           - mountPath: "/volume"
+             name: azurediskpv
+   ```
+
+1. Apply the YAML manifest file to deploy the pod.
+
+   ```azurecli-interactive
+   kubectl apply -f acstor-pod.yaml
+   ```
+
+   You should see output similar to the following:
+
+   ```output
+   pod/fiopod created
+   ```
+
+1. Check that the pod is running and that the persistent volume claim has been bound successfully to the pod:
+
+   ```azurecli-interactive
+   kubectl describe pod fiopod
+   kubectl describe pvc azurediskpvc
+   ```
+
+1. Check fio testing to see its current status:
+
+   ```azurecli-interactive
+   kubectl exec -it fiopod -- fio --name=benchtest --size=800m --filename=/volume/test --direct=1 --rw=randrw --ioengine=libaio --bs=4k --iodepth=16 --numjobs=8 --time_based --runtime=60
+   ```
+
+You've now deployed a pod that's using Azure Disks as its storage, and you can use it for your Kubernetes workloads.
+
 ## Create a pre-provisioned storage pool
 
 If you have Azure managed disks that are already provisioned, you can create a pre-provisioned storage pool using those disks. Because the disks are already provisioned, you don't need to specify the skuName or storage capacity when creating the storage pool.
@@ -186,115 +288,6 @@ Follow these steps to create a storage pool using your own encryption key. All p
 
 When the storage pool is created, Azure Container Storage will create a storage class on your behalf, using the naming convention `acstor-<storage-pool-name>`.
 
-## Display the available storage classes
-
-When the storage pool is ready to use, you must select a storage class to define how storage is dynamically created when creating persistent volume claims and deploying persistent volumes.
-
-Run `kubectl get sc` to display the available storage classes. You should see a storage class called `acstor-<storage-pool-name>`.
-
-> [!IMPORTANT]
-> Don't use the storage class that's marked **internal**. It's an internal storage class that's needed for Azure Container Storage to work.
-
-## Create a persistent volume claim
-
-A persistent volume claim (PVC) is used to automatically provision storage based on a storage class. Follow these steps to create a PVC using the new storage class. 
-
-1. Use your favorite text editor to create a YAML manifest file such as `code acstor-pvc.yaml`.
-
-1. Paste in the following code and save the file. The PVC `name` value can be whatever you want.
-
-   ```yml
-   apiVersion: v1
-   kind: PersistentVolumeClaim
-   metadata:
-     name: azurediskpvc
-   spec:
-     accessModes:
-       - ReadWriteOnce
-     storageClassName: acstor-azuredisk # replace with the name of your storage class if different
-     resources:
-       requests:
-         storage: 100Gi
-   ```
-
-1. Apply the YAML manifest file to create the PVC.
-   
-   ```azurecli-interactive
-   kubectl apply -f acstor-pvc.yaml
-   ```
-   
-   You should see output similar to:
-   
-   ```output
-   persistentvolumeclaim/azurediskpvc created
-   ```
-   
-   You can verify the status of the PVC by running the following command:
-   
-   ```azurecli-interactive
-   kubectl describe pvc azurediskpvc
-   ```
-
-Once the PVC is created, it's ready for use by a pod.
-
-## Deploy a pod and attach a persistent volume
-
-Create a pod using [Fio](https://github.com/axboe/fio) (Flexible I/O Tester) for benchmarking and workload simulation, and specify a mount path for the persistent volume. For **claimName**, use the **name** value that you used when creating the persistent volume claim.
-
-1. Use your favorite text editor to create a YAML manifest file such as `code acstor-pod.yaml`.
-
-1. Paste in the following code and save the file.
-
-   ```yml
-   kind: Pod
-   apiVersion: v1
-   metadata:
-     name: fiopod
-   spec:
-     nodeSelector:
-       acstor.azure.com/io-engine: acstor
-     volumes:
-       - name: azurediskpv
-         persistentVolumeClaim:
-           claimName: azurediskpvc
-     containers:
-       - name: fio
-         image: nixery.dev/shell/fio
-         args:
-           - sleep
-           - "1000000"
-         volumeMounts:
-           - mountPath: "/volume"
-             name: azurediskpv
-   ```
-
-1. Apply the YAML manifest file to deploy the pod.
-   
-   ```azurecli-interactive
-   kubectl apply -f acstor-pod.yaml
-   ```
-   
-   You should see output similar to the following:
-   
-   ```output
-   pod/fiopod created
-   ```
-
-1. Check that the pod is running and that the persistent volume claim has been bound successfully to the pod:
-
-   ```azurecli-interactive
-   kubectl describe pod fiopod
-   kubectl describe pvc azurediskpvc
-   ```
-
-1. Check fio testing to see its current status:
-
-   ```azurecli-interactive
-   kubectl exec -it fiopod -- fio --name=benchtest --size=800m --filename=/volume/test --direct=1 --rw=randrw --ioengine=libaio --bs=4k --iodepth=16 --numjobs=8 --time_based --runtime=60
-   ```
-
-You've now deployed a pod that's using Azure Disks as its storage, and you can use it for your Kubernetes workloads.
-
 ## Detach and reattach a persistent volume
 
 To detach a persistent volume, delete the pod that the persistent volume is attached to. Replace `<pod-name>` with the name of the pod, for example **fiopod**.
diff --git a/includes/container-storage-prerequisites.md b/includes/container-storage-prerequisites.md
@@ -11,3 +11,7 @@ ms.author: kendownie
 - This article requires the latest version (2.35.0 or later) of the Azure CLI. See [How to install the Azure CLI](/cli/azure/install-azure-cli). If you're using the Bash environment in Azure Cloud Shell, the latest version is already installed. If you plan to run the commands locally instead of in Azure Cloud Shell, be sure to run them with administrative privileges. For more information, see [Get started with Azure Cloud Shell](/azure/cloud-shell/get-started).
 
 - You'll need the Kubernetes command-line client, `kubectl`. It's already installed if you're using Azure Cloud Shell, or you can install it locally by running the `az aks install-cli` command.
+
+- If you haven't already installed Azure Container Storage, follow the instructions in [Install Azure Container Storage](../articles/storage/container-storage/container-storage-aks-quickstart.md).
+
+- Check if your target region is supported in [Azure Container Storage regions](../articles/storage/container-storage/container-storage-introduction.md#regional-availability).
