Skip to content

Commit 22765de

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-stack-docs-pr into amlfs-monitor-ref
2 parents 90e4696 + d1e01ad commit 22765de

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

AKS-Hybrid/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
href: cluster-k8s-version.md
147147
- name: Deleted cluster still visible in portal
148148
href: deleted-cluster-visible.md
149-
- name: Can't fully remove workload cluster with PodDisruptionBudget (PDB) resources
149+
- name: Can't fully delete AKS Arc cluster with PodDisruptionBudget (PDB) resources
150150
href: delete-cluster-pdb.md
151151
- name: Kubernetes version x.x.x is not available
152152
href: webhook-denied-request.md

AKS-Hybrid/aks-create-clusters-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ After a few minutes, the command completes and returns JSON-formatted informatio
5858
> - If you already have an SSH key on your local machine, the AKS cluster reuses that key. In this case, specifying `--generate-ssh-keys`, or omitting that parameter, has no effect.
5959
6060
> [!IMPORTANT]
61-
> To use Azure RBAC or workload identity for an AKS cluster, you must pass the required parameters during cluster creation using Azure CLI. Currently, updating an existing AKS cluster to enable workload identity and/or Azure RBAC is not supported. For more information, see [Use Azure RBAC for Kubernetes authorization](/azure/aks/hybrid/azure-rbac-23h2) or [Deploy and configure Workload Identity for your cluster}(workload-identity.md).
61+
> To use Azure RBAC or workload identity for an AKS cluster, you must pass the required parameters during cluster creation using Azure CLI. Currently, updating an existing AKS cluster to enable workload identity and/or Azure RBAC is not supported. For more information, see [Use Azure RBAC for Kubernetes authorization](/azure/aks/hybrid/azure-rbac-23h2) or [Deploy and configure Workload Identity for your cluster](workload-identity.md).
6262
6363
## Connect to the Kubernetes cluster
6464

AKS-Hybrid/aks-edge-workload-identity.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Azure Kubernetes Service (AKS) Edge Essentials is an on-premises Kubernetes impl
1717
- Deploy your application.
1818
- Example: Grant a pod in the cluster access to secrets in an Azure key vault.
1919

20+
For a conceptual overview of Workload identity federation, see [Workload identity federation in Azure Arc-enabled Kubernetes (preview)](/azure/azure-arc/kubernetes/conceptual-workload-identity).
21+
2022
> [!IMPORTANT]
2123
> These preview features are available on a self-service, opt-in basis. Previews are provided "as is" and "as available," and they're excluded from the service-level agreements and limited warranty. Azure Kubernetes Service Edge Essentials previews are partially covered by customer support on a best-effort basis.
2224

AKS-Hybrid/delete-cluster-pdb.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ ms.reviewer: leslielin
99

1010
---
1111

12-
# Can't fully remove workload cluster with PodDisruptionBudget (PDB) resources
12+
# Can't fully delete AKS Arc cluster with PodDisruptionBudget (PDB) resources
1313

1414
[!INCLUDE [hci-applies-to-23h2](includes/hci-applies-to-23h2.md)]
1515

16-
When you delete a workload cluster that has [PodDisruptionBudget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) (PDB) resources, the deletion might fail to remove the PDB resources. By default, PDB is installed in the Workload Identity-enabled AKS Arc cluster.
16+
When you delete an AKS Arc cluster that has [PodDisruptionBudget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) (PDB) resources, the deletion might fail to remove the PDB resources. By default, PDB is installed in the workload identity-enabled AKS Arc cluster.
1717

1818
## Workaround
1919

20-
Before you delete the AKS Arc cluster, access the target cluster's **kubeconfig** and delete the PDB:
20+
Before you delete the AKS Arc cluster, access the AKS Arc cluster's **kubeconfig** and delete all PDBs:
2121

22-
1. Access the target cluster:
22+
1. Access the AKS Arc cluster:
2323

2424
```azurecli
2525
az connectedk8s proxy -n $aks_cluster_name -g $resource_group_name
@@ -31,13 +31,13 @@ Before you delete the AKS Arc cluster, access the target cluster's **kubeconfig*
3131
kubectl get pdb -A
3232
```
3333

34-
1. Delete PDB:
34+
1. Delete all PDBs. Here's an example of deleting PDB generated from workload identity enablement:
3535

3636
```bash
3737
kubectl delete pdb azure-wi-webhook-controller-manager -n arc-workload-identity
3838
```
3939

40-
1. Delete cluster:
40+
1. Delete the AKS Arc cluster:
4141

4242
```azurecli
4343
az aksarc delete -n $aks_cluster_name -g $resource_group_name

0 commit comments

Comments
 (0)