Skip to content

Commit 9f4d37c

Browse files
authored
Merge pull request #17060 from MicrosoftDocs/main
2/12/2025 PM Publish
2 parents a60a843 + 67cb5a2 commit 9f4d37c

File tree

9 files changed

+202
-213
lines changed

9 files changed

+202
-213
lines changed

AKS-Arc/delete-cluster-pdb.md

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,47 @@ When you delete an AKS Arc cluster that has [PodDisruptionBudget](https://kubern
1919

2020
Before you delete the AKS Arc cluster, access the AKS Arc cluster's **kubeconfig** and delete all PDBs:
2121

22-
1. Access the AKS Arc cluster:
22+
1. Access the AKS Arc cluster according to its connectivity state:
2323

24-
```azurecli
25-
az connectedk8s proxy -n $aks_cluster_name -g $resource_group_name
26-
```
24+
- When the AKS Arc cluster is in a **Connected** state, run the [`az connectedk8s proxy`](/cli/azure/connectedk8s#az-connectedk8s-proxy) command
25+
26+
```azurecli
27+
az connectedk8s proxy -n $aks_cluster_name -g $resource_group_name
28+
```
29+
30+
- When the AKS Arc cluster is in a **disconnected** state, run the [`az aksarc get-credentials`](/cli/azure/aksarc#az-aksarc-get-credentials) command with permission to perform the **Microsoft.HybridContainerService/provisionedClusterInstances/listAdminKubeconfig/action** action, which is included in the **Azure Kubernetes Service Arc Cluster Admin** role permission. For more information, see [Retrieve certificate-based admin kubeconfig in AKS Arc](retrieve-admin-kubeconfig.md#retrieve-the-certificate-based-admin-kubeconfig-using-az-cli).
31+
32+
```azurecli
33+
az aksarc get-credentials -n $aks_cluster_name -g $resource_group_name --admin
34+
```
2735
2836
1. Verify PDB:
2937
3038
```bash
3139
kubectl get pdb -A
3240
```
3341

34-
1. Delete all PDBs. Here's an example of deleting a PDB generated from workload identity enablement:
42+
1. Delete all PDBs. The following command is an example of deleting a PDB generated from workload identity enablement:
3543

36-
```bash
37-
kubectl delete pdb azure-wi-webhook-controller-manager -n arc-workload-identity
38-
```
44+
```bash
45+
kubectl delete pdb azure-wi-webhook-controller-manager -n arc-workload-identity
46+
```
3947

4048
### [AKS on Azure Local](#tab/aks-on-azure-local)
4149

4250
4. Delete the AKS Arc cluster:
4351

44-
```azurecli
45-
az aksarc delete -n $aks_cluster_name -g $resource_group_name
46-
```
52+
```azurecli
53+
az aksarc delete -n $aks_cluster_name -g $resource_group_name
54+
```
4755

4856
### [AKS Edge Essentials](#tab/aks-edge-essentials)
4957

5058
4. Delete the AKS Arc cluster:
5159

52-
```azurecli
53-
az connectedk8s delete -n <cluster_name> -g <resource_group>
54-
```
60+
```azurecli
61+
az connectedk8s delete -n <cluster_name> -g <resource_group>
62+
```
5563

5664
---
5765

azure-local/manage/manage-secrets-rotation.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article describes how to manage internal secret rotation on Az
44
author: alkohli
55
ms.author: alkohli
66
ms.topic: how-to
7-
ms.date: 02/03/2025
7+
ms.date: 02/11/2025
88
ms.service: azure-local
99
---
1010

@@ -59,6 +59,49 @@ WARNING: Please close this session and log in again.
5959
PS C:\Users\MGMT>
6060
```
6161

62+
## Change cluster witness storage account key
63+
64+
This section describes how you can change the storage account key for the cluster witness storage account.
65+
66+
1. Sign in to one of the Azure Local nodes using deployment user credentials.
67+
68+
1. Configure the witness quorum using the secondary storage account key:
69+
70+
```powershell
71+
Set-ClusterQuorum -CloudWitness -AccountName <storage account name> -AccessKey <storage account secondary key>
72+
```
73+
74+
1. Rotate the storage account primary key.
75+
76+
1. Configure the witness quorum using the rotated storage account key:
77+
78+
```powershell
79+
Set-ClusterQuorum -CloudWitness -AccountName <storage account name> -AccessKey <storage account primary key>
80+
```
81+
82+
1. Rotate the storage account secondary key.
83+
84+
1. Update the storage account primary key in the ECE store:
85+
86+
```powershell
87+
$SecureSecretText = ConvertTo-SecureString -String "<Replace Storage account key>" -AsPlainText -Force
88+
$WitnessCred = New-Object -Type PSCredential -ArgumentList "WitnessCredential,$SecureSecretText"
89+
Set-ECEServiceSecret -ContainerName WitnessCredential -Credential $WitnessCred
90+
```
91+
92+
## Revoke SAS token for storage account used for Arc VM images
93+
94+
This section describes how you can revoke the Shared Access Signature (SAS) token for the storage account used for Arc VM images.
95+
96+
| SAS policy | SAS expired? | Steps to revoke |
97+
|---------|---------|---------|
98+
| Any SAS | Yes | No action is required as the SAS is no longer valid. |
99+
| Ad hoc SAS signed with an account key | No | [Manually rotate or regenerate Storage account key](/azure/storage/common/storage-account-keys-manage?tabs=azure-portal#manually-rotate-access-keys) used to create SAS. |
100+
| Ad hoc SAS signed with a user delegation key | No | To revoke user delegation key or change role assignments, see [Revoke a user delegation SAS](/rest/api/storageservices/create-user-delegation-sas#revoke-a-user-delegation-sas). |
101+
| SAS with stored access policy | No | To update the expiration time to a past date or time, or delete the stored access policy, see [Modify or revoke a stored access policy](/rest/api/storageservices/define-stored-access-policy#modify-or-revoke-a-stored-access-policy). |
102+
103+
For more information, see [Revoke a SAS](/rest/api/storageservices/create-service-sas#revoke-a-sas).
104+
62105
## Change deployment service principal
63106
64107
This section describes how you can change the service principal used for deployment.

azure-local/plan/cloud-deployment-network-considerations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Network considerations for cloud deployment for Azure Local, version 23H2
33
description: This article introduces network considerations for cloud deployments of Azure Local, version 23H2.
44
author: alkohli
55
ms.topic: conceptual
6-
ms.date: 02/11/2025
6+
ms.date: 02/12/2025
77
ms.author: alkohli
88
ms.reviewer: alkohli
99
---
@@ -210,7 +210,7 @@ New-VMSwitch -Name "ConvergedSwitch($IntentName)" -NetAdapterName "NIC1","NIC2"
210210
```
211211

212212
> [!NOTE]
213-
>Once Azure Local instance is deployed, it is not supported to change the Management intent name or the virtual switch name. It is required to use the same intent name and virtual switch name if you require to update or recreate the intent after deployment.
213+
> Once an Azure Local instance is deployed, changing the management intent name or the virtual switch name isn't supported. You must use the same intent name and virtual switch name if you need to update or recreate the intent after deployment.
214214
215215
#### 2. Configure management virtual network adapter using required Network ATC naming convention for all nodes
216216

azure-stack/operator/TOC.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,10 @@
3232
href: hotfix-1-2406-1-15.md
3333
- name: Hotfix 1.2406.1.14
3434
href: hotfix-1-2406-1-14.md
35-
- name: 2311
36-
items:
37-
- name: Hotfix 1.2311.3.62
38-
href: hotfix-1-2311-3-62.md
39-
- name: Hotfix 1.2311.3.61
40-
href: hotfix-1-2311-3-61.md
41-
- name: Hotfix 1.2311.3.50
42-
href: hotfix-1-2311-3-50.md
43-
- name: Hotfix 1.2311.3.44
44-
href: hotfix-1-2311-3-44.md
45-
- name: Hotfix 1.2311.2.23
46-
href: hotfix-1-2311-2-23.md
4735
- name: Archive
4836
items:
37+
- name: Hotfix 1.2311.3.62
38+
href: hotfix-1-2311-3-62.md
4939
- name: Hotfix 1.2306.4.102
5040
href: hotfix-1-2306-4-102.md
5141
- name: Hotfix 1.2301.3.97

azure-stack/operator/azure-stack-servicing-policy.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure Stack Hub
44
description: Learn about the Azure Stack Hub servicing policy and how to keep an integrated system in a supported state.
55
author: sethmanheim
66
ms.topic: article
7-
ms.date: 10/24/2024
7+
ms.date: 02/11/2025
88
ms.author: sethm
99
ms.lastreviewed: 03/18/2020
1010

@@ -46,9 +46,9 @@ Find documentation on how to plan for and manage updates, and how to determine y
4646

4747
For information about a specific update, including how to download it, see the release notes for that update:
4848

49+
- [Azure Stack Hub 2501 update](./release-notes.md?view=azs-2501&preserve-view=true)
4950
- [Azure Stack Hub 2408 update](./release-notes.md?view=azs-2408&preserve-view=true)
5051
- [Azure Stack Hub 2406 update](./release-notes.md?view=azs-2406&preserve-view=true)
51-
- [Azure Stack Hub 2311 update](./release-notes.md?view=azs-2311&preserve-view=true)
5252

5353
## Hotfixes
5454

@@ -78,11 +78,11 @@ You must also have an active support agreement with the hardware partner that ma
7878

7979
Hotfixes aren't considered major update versions. If your Azure Stack Hub instance is behind by more than two updates, it's considered out of compliance. You must update to at least the minimum supported version (N-2) to receive support.
8080

81-
For example, if the most recent update version available is 2408 (N), the two previous update versions were 2406 and 2311, which means both 2406 (N-1) and 2311 (N-2) remain in support. However, the 2306 (and earlier) version is out of support, as 2306 was N-3 when the 2408 update was released. For the current release of Azure Stack Hub, the following versions are considered in support:
81+
For example, if the most recent update version available is 2501 (N), the two previous update versions were 2408 and 2406, which means both 2408 (N-1) and 2406 (N-2) remain in support. However, the 2311 (and earlier) version is out of support, as 2311 was N-3 when the 2501 update was released. For the current release of Azure Stack Hub, the following versions are considered in support:
8282

83+
- [Azure Stack Hub 2501](./release-notes.md?view=azs-2501&preserve-view=true)
8384
- [Azure Stack Hub 2408](./release-notes.md?view=azs-2408&preserve-view=true)
8485
- [Azure Stack Hub 2406](./release-notes.md?view=azs-2406&preserve-view=true)
85-
- [Azure Stack Hub 2311](./release-notes.md?view=azs-2311&preserve-view=true)
8686

8787
Microsoft software update packages are non-cumulative and require the previous update package and latest hotfix to be installed as a prerequisite. If you decide to defer one or more updates, consider the overall runtime required to update to the latest version.
8888

azure-stack/operator/hotfix-1-2311-3-62.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@ title: Azure Stack Hub hotfix 1.2311.3.62
33
description: Summary of Azure Stack Hub hotfix 1.2311.3.62
44
author: sethmanheim
55
ms.topic: article
6-
ms.date: 01/08/2025
6+
ms.date: 02/12/2025
77
ms.author: sethm
88
ms.lastreviewed: 09/24/2024
99
---
1010

1111
# Azure Stack Hub hotfix 1.2311.3.62
1212

13-
## Summary
13+
## Summary of fixes
1414

1515
- Fixed an issue with DNS zone creation in SQL and MySQL resource providers.
16-
17-
## Fixes rolled up from previous hotfix releases
18-
1916
- Fixed bugs causing infrastructure faults.
2017
- Fixed an issue in which users were able to create duplicate and external infrastructure DNS zones.
2118
- Fixed the **CloudManifest** feature to avoid adding non-self-signed certificates to the root store.

0 commit comments

Comments
 (0)