Skip to content

Commit 847e3ab

Browse files
committed
Merge branch 'esa-container-storage' of https://github.com/sethmanheim/azure-docs-pr into esa-container-storage
2 parents 3040a5d + 3df2737 commit 847e3ab

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

articles/azure-arc/container-storage/includes/multi-node-ubuntu.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
ms.service: azure-arc
33
ms.topic: include
4-
ms.date: 08/16/2024
4+
ms.date: 08/30/2024
55
author: sethmanheim
66
ms.author: sethm
77
---
88

99
Then, perform the following steps in your Kubernetes cluster:
1010

1111
> [!IMPORTANT]
12-
> The following steps must be completed for **each node** in your Kubernetes cluster.
12+
> You must complete the following steps for each node in your Kubernetes cluster.
1313
1414
1. Run the following command to determine if you set `fs.inotify.max_user_instances` to 1024:
1515

@@ -41,9 +41,8 @@ Then, perform the following steps in your Kubernetes cluster:
4141
echo "vm.nr_hugepages=$HUGEPAGES_NR" | sudo tee /etc/sysctl.d/99-hugepages.conf
4242
```
4343

44-
1. Restart K3s using:
45-
44+
1. Restart K3s using the following command:
45+
4646
```bash
4747
sudo systemctl restart k3s || sudo systemctl restart k3s-agent
4848
```
49-

articles/azure-arc/container-storage/prepare-linux-edge-volumes.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
77
ms.custom: linux-related-content, references_regions
8-
ms.date: 08/26/2024
8+
ms.date: 08/30/2024
99

1010
---
1111

@@ -23,14 +23,14 @@ The article describes how to prepare Linux for Edge Volumes using AKS enabled by
2323
2424
### Uninstall previous instance of Azure Container Storage enabled by Azure Arc extension
2525

26-
If you previously installed a version of Azure Container Storage enabled by Azure Arc before version 2.1.0-preview, you must uninstall that previous instance in order to install the newer version. If you installed the 1.2.0-preview release or any release prior to that, please use instructions provided [here](release-notes.md#if-i-installed-a-the-120-preview-or-any-preview-prior-to-that-how-do-i-uninstall-the-extension). Versions after 2.1.0-preview will be upgradable and will not require this uninstall.
26+
If you previously installed a version of Azure Container Storage enabled by Azure Arc before version 2.1.0-preview, you must uninstall that previous instance in order to install the newer version. If you installed the 1.2.0-preview release or any release prior to that, please use instructions provided [here](release-notes.md#if-i-installed-a-the-120-preview-or-any-preview-prior-to-that-how-do-i-uninstall-the-extension). Versions after 2.1.0-preview are upgradable and do not require this uninstall.
2727

28-
1. In order to delete the old version of the extension, the Kubernetes resources holding references to old version of the extension must be cleaned up. Any pending resources will hold the clean-up of the extension. There are at least two ways to clean up these resources, either using `kubectl delete <resource_type> <resource_name>` or by 'un-applying' the YAML files used to create the resources. The resources that need to be deleted are typically the 'pod(s)', the PVC referenced, and the subvolume CRD (if *Cloud Ingest Edge Volume* was configured). Alternatively, the 4 following YAML files can be be fed to 'kubectl delete -f' using the following commands in the specified order. These variables must be updated with your information:
28+
1. In order to delete the old version of the extension, the Kubernetes resources holding references to old version of the extension must be cleaned up. Any pending resources can delay the clean-up of the extension. There are at least two ways to clean up these resources: either using `kubectl delete <resource_type> <resource_name>`, or by "un-applying" the YAML files used to create the resources. The resources that need to be deleted are typically the pods, the PVC referenced, and the sub-volume CRD (if Cloud Ingest Edge Volume was configured). Alternatively, the following 4 YAML files can be be passed to `kubectl delete -f` using the following commands in the specified order. These variables must be updated with your information:
2929

30-
- `YOUR_DEPLOYMENT_FILE_NAME_HERE`: Add your deployment file name(s). In this documentation, the file name used was `deploymentExample.yaml`. If you created multiple deployments, each one must be deleted on a separte line.
31-
- `YOUR_PVC_FILE_NAME_HERE`: Add your Persistent Volume Claim file name(s). In this documentation, if you used the *Cloud Ingest Edge Volume*, the file name used was `cloudIngestPVC.yaml`. If you used the *Local Shared Edge Volume*, the file name used was `localSharedPVC.yaml`. If you created multiple PVCs, each one must be deleted on a separate line.
32-
- `YOUR_EDGE_SUBVOLUME_FILE_NAME_HERE`: Add your Edge Subvolume file name(s). In this documentation, the file name used was `edgeSubvolume.yaml`. If you created multiple subvolumes, each one must be deleted on a separate line.
33-
- `YOUR_EDGE_STORAGE_CONFIGURATION_FILE_NAME_HERE`: Add your Edge Storage Configuration file name here. In this documentation, the file name used was `edgeConfig.yaml`.
30+
- `YOUR_DEPLOYMENT_FILE_NAME_HERE`: Add your deployment file names. In the example in this article, the file name used was `deploymentExample.yaml`. If you created multiple deployments, each one must be deleted on a separate line.
31+
- `YOUR_PVC_FILE_NAME_HERE`: Add your Persistent Volume Claim file names. In the example in this article, if you used the Cloud Ingest Edge Volume, the file name used was `cloudIngestPVC.yaml`. If you used the Local Shared Edge Volume, the file name used was `localSharedPVC.yaml`. If you created multiple PVCs, each one must be deleted on a separate line.
32+
- `YOUR_EDGE_SUBVOLUME_FILE_NAME_HERE`: Add your Edge sub-volume file names. In the example in this article, the file name used was `edgeSubvolume.yaml`. If you created multiple sub-volumes, each one must be deleted on a separate line.
33+
- `YOUR_EDGE_STORAGE_CONFIGURATION_FILE_NAME_HERE`: Add your Edge storage configuration file name here. In the example in this article, the file name used was `edgeConfig.yaml`.
3434

3535
```bash
3636
kubectl delete -f "<YOUR_DEPLOYMENT_FILE_NAME_HERE.yaml>"
@@ -39,7 +39,7 @@ If you previously installed a version of Azure Container Storage enabled by Azur
3939
kubectl delete -f "<YOUR_EDGE_STORAGE_CONFIGURATION_FILE_NAME_HERE.yaml>"
4040
```
4141

42-
1. After you delete the files for your deployment(s), PVC(s), Edge Subvolume(s), and Edge Storage Configuration from the previous step, you can uninstall the extension using the following command. Replace `YOUR_RESOURCE_GROUP_NAME_HERE`, `YOUR_CLUSTER_NAME_HERE`, and `YOUR_EXTENSION_NAME_HERE` with your respective information:
42+
1. After you delete the files for your deployments, PVCs, Edge sub-volumes, and Edge storage configuration from the previous step, you can uninstall the extension using the following command. Replace `YOUR_RESOURCE_GROUP_NAME_HERE`, `YOUR_CLUSTER_NAME_HERE`, and `YOUR_EXTENSION_NAME_HERE` with your respective information:
4343

4444
```azurecli
4545
az k8s-extension delete --resource-group YOUR_RESOURCE_GROUP_NAME_HERE --cluster-name YOUR_CLUSTER_NAME_HERE --cluster-type connectedClusters --name YOUR_EXTENSION_NAME_HERE

0 commit comments

Comments
 (0)