Merge branch 'main' into CI-8135

Author: ryanberg-aquent

Office/Client/office-suite-issues/product-ids-supported-office-deployment-click-to-run.md

@@ -1,23 +1,24 @@
 ---
-title: Product IDs that are supported by the Office Deployment Tool for Click-to-Run
+title: Product IDs supported by the Office Deployment Tool for Click-to-Run
 description: Lists product IDs that the Office Deployment Tool for Click-to-Run supports.
 author: Cloud-Writer
 ms.author: meerak
-ms.date: 05/29/2025
+ms.date: 11/07/2025
 manager: dcscontentpm
 search.appverid: 
 - MET150
 audience: ITPro
 ms.custom: 
-  - CSSTroubleshoot
-  - CI 114638
+- CSSTroubleshoot
+- CI 114638
+- CI 8065
 ms.topic: troubleshooting
-ms.reviewer: vikkarti
+ms.reviewer: vikkarti;bcorob;jefferc
 appliesto:
 - Microsoft Office Deployment Tool
 ---
 
-# List of Product IDs that are supported by the Office Deployment Tool for Click-to-Run
+# Product IDs supported by the Office Deployment Tool for Click-to-Run
 
 The following product IDs are supported by the Office Deployment Tool in Microsoft 365 and Microsoft 365 deployments:
 
@@ -59,115 +60,70 @@ In addition to these product IDs, the following non-Microsoft 365 product IDs ar
 > [!NOTE]
 > For Lync or Skype for Business, see the table at the end of this article.
 
-- `AccessRetail`
-- `Access2019Retail`
 - `Access2021Retail`
 - `Access2024Retail`
-- `Access2019Volume`
 - `Access2021Volume`
 - `Access2024Volume`
-- `ExcelRetail`
-- `Excel2019Retail`
 - `Excel2021Retail`
 - `Excel2024Retail`
-- `Excel2019Volume`
 - `Excel2021Volume`
 - `Excel2024Volume`
-- `HomeBusinessRetail`
-- `HomeBusiness2019Retail`
 - `HomeBusiness2021Retail`
 - `HomeBusiness2024Retail`
-- `HomeStudentRetail`
-- `HomeStudent2019Retail`
 - `HomeStudent2021Retail`
 - `Home2024Retail`
 - `O365HomePremRetail`
 - `OneNoteFreeRetail`
-- `OneNoteRetail`
 - `OneNote2021Volume`
 - `OneNote2024Volume`
 - `OutlookRetail`
-- `Outlook2019Retail`
 - `Outlook2021Retail`
 - `Outlook2024Retail`
-- `Outlook2019Volume`
 - `Outlook2021Volume`
 - `Outlook2024Volume`
-- `Personal2019Retail`
 - `Personal2021Retail`
-- `PowerPointRetail`
-- `PowerPoint2019Retail`
 - `PowerPoint2021Retail`
 - `PowerPoint2024Retail`
-- `PowerPoint2019Volume`
 - `PowerPoint2021Volume`
 - `PowerPoint2024Volume`
-- `ProfessionalRetail`
-- `Professional2019Retail`
 - `Professional2021Retail`
 - `Professional2024Retail`
-- `ProjectProXVolume`
-- `ProjectPro2019Retail`
 - `ProjectPro2021Retail`
 - `ProjectPro2024Retail`
-- `ProjectPro2019Volume`
 - `ProjectPro2021Volume`
 - `ProjectPro2024Volume`
 - `ProjectStdRetail`
-- `ProjectStdXVolume`
-- `ProjectStd2019Retail`
 - `ProjectStd2021Retail`
 - `ProjectStd2024Retail`
-- `ProjectStd2019Volume`
 - `ProjectStd2021Volume`
 - `ProjectStd2024Volume`
-- `ProPlus2019Volume`
 - `ProPlus2021Volume`
 - `ProPlus2024Volume`
 - `ProPlusSPLA2021Volume`
-- `ProPlus2019Retail`
 - `ProPlus2021Retail`
 - `ProPlus2024Retail`
-- `PublisherRetail`
-- `Publisher2019Retail`
 - `Publisher2021Retail`
-- `Publisher2019Volume`
 - `Publisher2021Volume`
-- `Standard2019Volume`
 - `Standard2021Volume`
 - `StandardSPLA2021Volume`
 - `Standard2024Volume`
-- `VisioProXVolume`
-- `VisioPro2019Retail`
 - `VisioPro2021Retail`
 - `VisioPro2024Retail`
-- `VisioPro2019Volume`
 - `VisioPro2021Volume`
 - `VisioPro2024Volume`
 - `VisioStdRetail`
-- `VisioStdXVolume`
-- `VisioStd2019Retail`
 - `VisioStd2021Retail`
 - `VisioStd2024Retail`
-- `VisioStd2019Volume`
 - `VisioStd2021Volume`
 - `VisioStd2024Volume`
-- `WordRetail`
-- `Word2019Retail`
 - `Word2021Retail`
 - `Word2024Retail`
-- `Word2019Volume`
 - `Word2021Volume`
 - `Word2024Volume`
 
 For managing the Lync or Skype for Business clients, the following table lists the tool version and the correct product ID.
 
 |**Product**                       |**Version of the Office Deployment Tool**      |**Product ID**     |
 |----------------------------------|-----------------------------------------------|-------------------|
-|Skype for Business 2016     |[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)      |`SkypeforBusinessRetail`       |
-|Skype for Business Basic 2016     |[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)      |`SkypeforBusinessEntryRetail`       |
-|Skype for Business 2019           |[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)      |`SkypeforBusiness2019Retail`            |
-|Skype for Business 2019 (volume licensed)         |[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)      |`SkypeforBusiness2019Volume`            |
-|Skype for Business Basic 2019     |[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)      |`SkypeforBusinessEntry2019Retail`            |
 |Skype for Business LTSC 2021|[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)|`SkypeforBusiness2021Volume`|
 |Skype for Business LTSC 2024|[Office Deployment Tool](https://go.microsoft.com/fwlink/p/?LinkID=626065)|`SkypeforBusiness2024Volume`|

support/azure/azure-kubernetes/error-codes/vmextensionerror-oraspullunauthorized.md

@@ -37,18 +37,22 @@ To resolve this issue, follow these steps:
     export REGISTRY_ID=$(az aks show -g ${RESOURCE_GROUP} -n ${CLUSTER_NAME} --query 'bootstrapProfile.containerRegistryId' -o tsv)
     ```
 
-3. If the issue is related to a 401 error, check if the kubelet identity has the `acrpull` permission to the ACR by running the following command:
-
-    ```console
-    export KUBELET_IDENTITY_PRINCIPAL_ID=$(az aks show -g ${RESOURCE_GROUP} -n ${CLUSTER_NAME} --query 'identityProfile.kubeletidentity.clientId' -o tsv)
-    ```
-
-    If not, run the following command:
-
-    ```console
-    az role assignment create --role AcrPull --scope ${REGISTRY_ID} --assignee-object-id ${KUBELET_IDENTITY_PRINCIPAL_ID} --assignee-principal-type ServicePrincipal
-    ```
-
+3. If the issue is related to a 401 unauthorized error, you must ensure that the AKS identity has the necessary ACR role to authorize with the registry. You can do so by checking the ACR registry's role assignments to see if there is an existing role assignment for the AKS identity.
+
+   To ensure that the AKS identity has permissions to the ACR registry, first obtain the AKS identity's principal ID by running the following command.
+
+   ```console
+   export KUBELET_IDENTITY_PRINCIPAL_ID=$(az aks show -g ${RESOURCE_GROUP} -n ${CLUSTER_NAME} --query 'identityProfile.kubeletidentity.clientId' -o tsv)
+   ```
+    
+   Afterwards, assign the correct ACR role to the AKS identity. If your registry's role assignment permissions mode is "ABAC-enabled" and configured to "RBAC Registry + ABAC Repository Permissions," you must assign the `Container Registry Repository Reader` role. Otherwise, if your registry's role assignment permissions mode is not ABAC-enabled and only configured to "RBAC Registry Permissions," you must assign the `AcrPull` role. Please see https://aka.ms/acr/auth/abac for more information on ABAC-enabled ACR registries and the different roles required.
+   
+   For ABAC-enabled registries, run the following command. For non-ABAC enabled registries, replace `Container Registry Repository Reader` in the following command with `AcrPull` instead.
+   
+   ```console
+   az role assignment create --role "Container Registry Repository Reader" --scope ${REGISTRY_ID} --assignee-object-id ${KUBELET_IDENTITY_PRINCIPAL_ID} --assignee-principal-type ServicePrincipal
+   ```
+    
 4. If the log error indicates that the identity isn't found, manually bind the kubelet identity to the Virtual Machine Scale Set (VMSS) for a quick fix.
 
 5. If the issue is related to IMDS connection time-out, submit a support ticket.
@@ -63,3 +67,4 @@ To resolve this issue, follow these steps:
 - [container registry authentication managed identity](/azure/container-registry/container-registry-authentication-managed-identity)
 
 [!INCLUDE [Azure Help Support](../../../includes/azure-help-support.md)]
+