Merge pull request #311461 from eh8/main

Fix ACStor Terraform

Author: JillGrant615

articles/storage/container-storage/container-storage-faq.md

@@ -27,7 +27,7 @@ Azure Container Storage is a cloud-based volume management, deployment, and orch
   | Azure Container Storage version | Storage types supported | Installer present | Driver installation trigger |
   |---|---|---|---|
   | 2.0.x | Local NVMe | No | Installed during `--enable-azure-container-storage` |
-  | 2.1.x and later | Local NVMe and Elastic SAN | Yes | Via storage type selection during enable or by creating a StorageClass (installer-only flow) |
+  | 2.1.x and later | Local NVMe and Elastic SAN | Yes | Via storage type selection during enable or by creating a storage class (installer-only flow) |
 
 * <a id="azure-container-storage-install-models"></a>
   **What installation models are available in version 2.1.x and later?**
@@ -43,7 +43,7 @@ Azure Container Storage is a cloud-based volume management, deployment, and orch
   **Behavior:**
   - Installs only the installer.
   - No storage-specific driver or node agent is installed initially.
-  - Creating a StorageClass later triggers the correct CSI driver installation.
+  - Creating a storage class later triggers the correct CSI driver installation.
 
   **Installer + storage type(s)**  
   Use this option when you know the backend(s) required.
@@ -60,7 +60,7 @@ Azure Container Storage is a cloud-based volume management, deployment, and orch
 
   **Behavior:**
   - Installs the installer plus the selected CSI driver(s).
-  - Creates default StorageClass objects if none exists.
+  - Creates default storage class objects if none exists.
   - Supports comma-separated storage types.
 
   Supported storage types for version 2.1.0 and later: `ephemeralDisk` (local NVMe) and `elasticSan` (Azure Elastic SAN).
@@ -69,27 +69,27 @@ Azure Container Storage is a cloud-based volume management, deployment, and orch
   **How do installation models work with Terraform?**
   The extension configuration supports the same flows as Azure CLI:
 
-  - **Installer-only (choose storage later):** Set `enable-azure-container-storage` to `true`. Create a StorageClass later to trigger driver installation.
+  - **Installer-only (choose storage later):** Set `enable-azure-container-storage` to `true`. Create a storage class later to trigger driver installation.
   - **Installer + storage type(s):** Set `enable-azure-container-storage` to a storage type value such as `ephemeralDisk`, `elasticSan`, or a comma-separated list like `ephemeralDisk,elasticSan`. This installs the installer and the selected CSI drivers.
 
   Supported storage types for version 2.1.0 and later: `ephemeralDisk` (local NVMe) and `elasticSan` (Azure Elastic SAN).
 
 * <a id="azure-container-storage-components"></a>
   **What components are installed in installer-only mode?**
-  Installer-only mode creates the installer and telemetry deployments in the `kube-system` namespace, but doesn't install any CSI drivers or node agents until you enable a storage type or create a StorageClass.
+  Installer-only mode creates the installer and telemetry deployments in the `kube-system` namespace, but doesn't install any CSI drivers or node agents until you enable a storage type or create a storage class.
 
   | Component | Resource type | Name | Description |
   |---|---|---|---|
-  | Installer | Deployment | acstor-cluster-manager | Core controller that watches StorageClass objects and orchestrates CSI driver lifecycle |
+  | Installer | Deployment | acstor-cluster-manager | Core controller that watches storage class objects and orchestrates CSI driver lifecycle |
   | Telemetry | Deployment | acstor-geneva | Internal monitoring and telemetry containers |
 
 * <a id="azure-container-storage-driver-install"></a>
   **When are CSI drivers installed?**
-  If you enable a storage type during installation, the driver installs immediately and default StorageClass objects are created if missing. If you choose installer-only, the driver installs when you create a StorageClass (or if a StorageClass already exists).
+  If you enable a storage type during installation, the driver installs immediately and default storage class objects are created if missing. If you choose installer-only, the driver installs when you create a storage class (or if a storage class already exists).
 
 * <a id="azure-container-storage-driver-components"></a>
   **What gets installed when a CSI driver is enabled?**
-  When you enable a storage type or create a StorageClass, Azure Container Storage installs the storage-specific CSI driver plus supporting components.
+  When you enable a storage type or create a storage class, Azure Container Storage installs the storage-specific CSI driver plus supporting components.
 
   | Component | Resource type | Name | Description |
   |---|---|---|---|
@@ -117,7 +117,7 @@ Azure Container Storage is a cloud-based volume management, deployment, and orch
 
 * <a id="azure-container-storage-node-scheduling"></a>
   **How are Azure Container Storage components scheduled?**
-  CSI drivers run according to StorageClass affinity. The node agent runs wherever a driver is present, and the installer prefers system node pools.
+  CSI drivers run according to storage class affinity. The node agent runs wherever a driver is present, and the installer prefers system node pools.
 
 * <a id="azure-container-storage-vs-csi-drivers"></a>
   **What's the difference between Azure Container Storage and Azure CSI (Container Storage Interface) drivers?**  

articles/storage/container-storage/install-container-storage-aks.md

@@ -104,9 +104,9 @@ Run the following command to create a new AKS cluster and install Azure Containe
 az aks create -n <cluster-name> -g <resource-group> --node-vm-size Standard_L8s_v3 --enable-azure-container-storage --generate-ssh-keys
 ```
 
-The deployment can take up to 5 minutes. CSI driver installation is deferred until you create a StorageClass or enable a storage type later.
+The deployment can take up to 5 minutes. CSI driver installation is deferred until you create a storage class or enable a storage type later.
 
-Follow the instructions for creating a [local NVMe](use-container-storage-with-local-disk.md) StorageClass or [Elastic SAN](use-container-storage-with-elastic-san.md) StorageClass.
+Follow the instructions for creating a [local NVMe](use-container-storage-with-local-disk.md) storage class or [Elastic SAN](use-container-storage-with-elastic-san.md) storage class.
 
 ### Installer + storage type installation
 
@@ -116,7 +116,7 @@ Run the following command to create a new AKS cluster and install Azure Containe
 az aks create -n <cluster-name> -g <resource-group> --node-vm-size Standard_L8s_v3 --enable-azure-container-storage ephemeralDisk --generate-ssh-keys
 ```
 
-This command installs the installer, deploys the `ephemeralDisk` driver, and creates a default StorageClass. You can install and use both local NVMe and Elastic SAN by providing comma-separated values such as `ephemeralDisk,elasticSan`.
+This command installs the installer, deploys the `ephemeralDisk` driver, and creates a default storage class. You can install and use both local NVMe and Elastic SAN by providing comma-separated values such as `ephemeralDisk,elasticSan`.
 
 ## Install Azure Container Storage on an existing AKS cluster
 
@@ -128,7 +128,7 @@ Run the following command to enable Azure Container Storage on an existing AKS c
 az aks update -n <cluster-name> -g <resource-group> --enable-azure-container-storage
 ```
 
-The deployment can take up to 5 minutes. When it completes, the cluster has the Azure Container Storage installer component installed. CSI driver installation is deferred until you create a StorageClass or enable a storage type later. Follow the instructions for creating a [local NVMe](use-container-storage-with-local-disk.md) StorageClass or [Elastic SAN](use-container-storage-with-elastic-san.md) StorageClass.
+The deployment can take up to 5 minutes. When it completes, the cluster has the Azure Container Storage installer component installed. CSI driver installation is deferred until you create a storage class or enable a storage type later. Follow the instructions for creating a [local NVMe](use-container-storage-with-local-disk.md) storage class or [Elastic SAN](use-container-storage-with-elastic-san.md) storage class.
 
 ### Installer + storage type installation
 
@@ -138,7 +138,7 @@ Run the following command to enable Azure Container Storage on an existing AKS c
 az aks update -n <cluster-name> -g <resource-group> --enable-azure-container-storage elasticSan
 ```
 
-This command installs the installer, deploys the Elastic SAN CSI driver, and creates a default StorageClass. You can install and use both local NVMe and Elastic SAN by providing comma-separated values such as `ephemeralDisk,elasticSan`.
+This command installs the installer, deploys the Elastic SAN CSI driver, and creates a default storage class. You can install and use both local NVMe and Elastic SAN by providing comma-separated values such as `ephemeralDisk,elasticSan`.
 
 ::: zone-end
 
@@ -234,39 +234,29 @@ az account set --subscription <subscription-id>
       name           = "acstor"
       cluster_id     = azurerm_kubernetes_cluster.aks.id
       extension_type = "microsoft.azurecontainerstoragev2"
-
-      configuration_settings = {
-        enable-azure-container-storage = "true"
-      }
-    }
-    ```
-
-    To install Elastic SAN during deployment, set `enable-azure-container-storage` to `elasticSan` or a comma-separated list:
-
-    ```tf
-    configuration_settings = {
-      enable-azure-container-storage = "elasticSan"
     }
     ```
 
-2. Initialize the working directory to download the AzureRM provider.
+1. Initialize the working directory to download the AzureRM provider.
 
     ```bash
     terraform init
     ```
 
-3. Review the planned changes.
+1. Review the planned changes.
 
     ```bash
     terraform plan
     ```
 
-4. Apply the configuration to create the resource group, AKS cluster, and Azure Container Storage extension. Deployment typically takes 5 to 10 minutes.
+1. Apply the configuration to create the resource group, AKS cluster, and Azure Container Storage extension. Deployment typically takes 5 minutes. 
 
     ```bash
     terraform apply
     ```
 
+When it completes, the cluster has the Azure Container Storage installer component installed. CSI driver installation is deferred until you create a storage class. Follow the instructions for creating a [local NVMe](use-container-storage-with-local-disk.md) storage class or [Elastic SAN](use-container-storage-with-elastic-san.md) storage class.
+
 ## Install Azure Container Storage on an existing AKS cluster
 
 If your AKS cluster already exists and you manage it outside of Terraform, you can still enable Azure Container Storage by authoring only the extension resource. Use a data source to look up the cluster ID.
@@ -296,16 +286,12 @@ resource "azurerm_kubernetes_cluster_extension" "container_storage" {
   name           = "acstor"
   cluster_id     = data.azurerm_kubernetes_cluster.existing.id
   extension_type = "microsoft.azurecontainerstoragev2"
-
-  configuration_settings = {
-    enable-azure-container-storage = "true"
-  }
 }
 ```
 
-To install Elastic SAN or local NVMe during deployment, set `enable-azure-container-storage` to a storage type or comma-separated list (for example, `elasticSan` or `ephemeralDisk,elasticSan`).
+Run `terraform init` (if this is a new working directory) followed by `terraform apply` to install Azure Container Storage on the targeted cluster. Deployment typically takes 5 minutes. 
 
-Run `terraform init` (if this is a new working directory) followed by `terraform apply` to install Azure Container Storage on the targeted cluster.
+When it completes, the cluster has the Azure Container Storage installer component installed. CSI driver installation is deferred until you create a storage class. Follow the instructions for creating a [local NVMe](use-container-storage-with-local-disk.md) storage class or [Elastic SAN](use-container-storage-with-elastic-san.md) storage class.
 
 ::: zone-end
 
@@ -326,9 +312,9 @@ acstor-cluster-manager                2/2     2            2           4d9h
 acstor-geneva                         2/2     2            2           4d9h
 ```
 
-### Verify StorageClass presence
+### Verify storage class presence
 
-After you create a StorageClass or enable a storage type, verify the StorageClass:
+After you create a storage class or enable a storage type, verify the storage class:
 
 ```azurecli
 kubectl get sc
@@ -344,7 +330,7 @@ local                   localdisk.csi.acstor.io   Delete          WaitForFirstCo
 
 ### Verify driver installation
 
-Verify the components expected after StorageClass creation or storage type installation:
+Verify the components expected after storage class creation or storage type installation:
 
 ```azurecli
 kubectl get pod -n kube-system | grep acstor

articles/storage/container-storage/remove-container-storage.md

@@ -16,60 +16,22 @@ This article shows how to remove Azure Container Storage components from your Az
 > [!IMPORTANT]
 > This article applies to [Azure Container Storage (version 2.x.x)](container-storage-introduction.md). If you have Azure Container Storage (version 1.x.x) installed on your AKS cluster, remove it by following [these steps](remove-container-storage-version-1.md).
 
-## Remove Azure Container Storage
-
-You can either remove the components for a specific storage type or remove Azure Container Storage entirely.
-
-- CSI driver for specific storage types
-- The entire Azure Container Storage installation (installer and CSI drivers)
-
-> [!IMPORTANT]
-> Delete all persistent volume claims (PVCs) and persistent volumes (PVs) before uninstalling the extension. Removing Azure Container Storage without cleaning up these resources can disrupt running workloads. Ensure no workloads or StorageClass objects rely on Azure Container Storage before you continue.
-
-## Remove CSI driver for a specific storage type
-
-Remove the CSI driver by running the following Azure CLI command. Replace `<cluster-name>` and `<resource-group>` with your own values.
-
-```azurecli-interactive
-az aks update -n <cluster-name> -g <resource-group> --disable-azure-container-storage <storage-type>
-```
-
-Supported storage type values:
-
-- `ephemeralDisk` - removes only the local CSI driver
-- `elasticSan` - removes only the Elastic SAN CSI driver
-- `all` - removes both Elastic SAN and local CSI drivers
-
-You can also use comma-separated values to remove specific CSI drivers, such as `ephemeralDisk,elasticSan`.
-
-This command removes the specified CSI driver(s), while the Azure Container Storage installer components remain installed.
-
 ## Remove the entire Azure Container Storage installation (installer and CSI drivers)
 
+Delete all persistent volume claims (PVCs) and persistent volumes (PVs) before uninstalling the extension. Removing Azure Container Storage without cleaning up these resources can disrupt running workloads. Ensure no workloads or StorageClass objects rely on Azure Container Storage before you continue. 
+
 Remove Azure Container Storage entirely by running the following Azure CLI command. Replace `<cluster-name>` and `<resource-group>` with your own values.
 
 ```azurecli
 az aks update -n <cluster-name> -g <resource-group> --disable-azure-container-storage
 ```
 
-## Re-enable Azure Container Storage
-
-If you previously removed CSI drivers for one or more storage types, you can re-enable the storage type by running the following Azure CLI command.
-
-```azurecli
-az aks update -n <cluster-name> -g <resource-group> --enable-azure-container-storage <storage-type>
-```
-
-Expected behavior:
-
-- Specifying a storage type is optional. When no storage type is provided, only the Azure Container Storage installer component is installed, if it isn't already present.
-- When a storage type is specified, the corresponding CSI driver is installed. If a StorageClass for that storage type already exists, only the driver is installed; otherwise, a default StorageClass is created as part of the installation.
-
 ### Remove the extension with Terraform
 
 If you provisioned Azure Container Storage with Terraform, remove the corresponding extension resource from your configuration and apply the change so the result matches the CLI workflow.
 
 1. Delete the `azurerm_kubernetes_cluster_extension` block (or set `count = 0`) in your Terraform configuration and save the file.
+
 1. Review the plan to confirm Terraform destroys only the extension resource.
 
     ```bash
@@ -82,8 +44,18 @@ If you provisioned Azure Container Storage with Terraform, remove the correspond
     terraform apply
     ```
 
-> [!NOTE]
-> Terraform manages the extension resource. If you want to remove only a specific storage type (for example, Elastic SAN or local NVMe), use the Azure CLI workflow in this article. Terraform doesn't provide a separate disable flag per storage type.
+## Re-enable Azure Container Storage
+
+If you previously removed CSI drivers for one or more storage types, you can re-enable the storage type by running the following Azure CLI command.
+
+```azurecli
+az aks update -n <cluster-name> -g <resource-group> --enable-azure-container-storage <storage-type>
+```
+
+Expected behavior:
+
+- Specifying a storage type is optional. When no storage type is provided, only the Azure Container Storage installer component is installed, if it isn't already present.
+- When a storage type is specified, the corresponding CSI driver is installed. If a StorageClass for that storage type already exists, only the driver is installed; otherwise, a default StorageClass is created as part of the installation.
 
 ## Delete the AKS cluster
 
@@ -112,3 +84,5 @@ az group delete --name <resource-group>
 ## See also
 
 - [What is Azure Container Storage?](container-storage-introduction.md)
+- [Use Azure Container Storage with local NVMe](use-container-storage-with-local-disk.md)
+- [Use Azure Container Storage with Elastic SAN](use-container-storage-with-elastic-san.md)

articles/storage/container-storage/use-container-storage-with-elastic-san.md

@@ -62,6 +62,44 @@ allowVolumeExpansion: true
 
 The default Elastic SAN capacity provisioned with this storage class is 1 TiB.
 
+Alternatively, you can create the storage class using Terraform.
+
+1. Use Terraform to manage the storage class by creating a configuration like the following `main.tf`. Update the provider version or kubeconfig path as needed for your environment.
+
+    ```tf
+    terraform {
+      required_version = ">= 1.5.0"
+      required_providers {
+        kubernetes = {
+          source  = "hashicorp/kubernetes"
+          version = "~> 3.0"
+        }
+      }
+    }
+
+    provider "kubernetes" {
+      config_path = "~/.kube/config"
+    }
+
+    resource "kubernetes_storage_class_v1" "azuresan" {
+      metadata {
+        name = "azuresan"
+      }
+
+      storage_provisioner    = "san.csi.azure.com"
+      reclaim_policy         = "Delete"
+      volume_binding_mode    = "Immediate"
+      allow_volume_expansion = true
+    }
+    ```
+
+1. Initialize and apply the configuration.
+
+    ```bash
+    terraform init
+    terraform apply
+    ```
+
 ### Create a storage class with custom Elastic SAN capacity
 
 If you need a different initial capacity than the default 1 TiB, set the `initialStorageTiB` parameter in the storage class.

articles/storage/container-storage/use-container-storage-with-local-disk.md

@@ -99,7 +99,7 @@ Alternatively, you can create the storage class using Terraform.
       required_providers {
         kubernetes = {
           source  = "hashicorp/kubernetes"
-          version = "~> 3.x"
+          version = "~> 3.0"
         }
       }
     }