Merge pull request #510 from MicrosoftDocs/main

Merge main to live, 4 AM
MicrosoftDocs · Nov 7, 2024 · 2cbc87a · 2cbc87a
2 parents f135056 + be1d694
commit 2cbc87a
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 22 deletions.
diff --git a/articles/aks/azure-netapp-files-nfs.md b/articles/aks/azure-netapp-files-nfs.md
@@ -329,7 +329,7 @@ To instruct Astra Trident about the Azure NetApp Files subscription and where it
       name: backend-tbc-anf-secret
     type: Opaque
     stringData:
-      clientID: abcde356-bf8e-fake-c111-abcde35613aa
+      clientID: 00001111-aaaa-2222-bbbb-3333cccc4444
       clientSecret: rR0rUmWXfNioN1KhtHisiSAnoTherboGuskey6pU
     ```
 
@@ -343,8 +343,8 @@ To instruct Astra Trident about the Azure NetApp Files subscription and where it
     spec:
       version: 1
       storageDriverName: azure-netapp-files
-      subscriptionID: 12abc678-4774-fake-a1b2-a7abcde39312
-      tenantID: a7abcde3-edc1-fake-b111-a7abcde356cf
+      subscriptionID: aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e
+      tenantID: aaaabbbb-0000-cccc-1111-dddd2222eeee
       location: eastus
       serviceLevel: Premium
       credentials:
@@ -589,4 +589,3 @@ Astra Trident supports many features with Azure NetApp Files. For more informati
 [install-azure-cli]: /cli/azure/install-azure-cli
 [use-tags]: use-tags.md
 [azure-ad-app-registration]: /azure/active-directory/develop/howto-create-service-principal-portal
-
diff --git a/articles/aks/azure-netapp-files-smb.md b/articles/aks/azure-netapp-files-smb.md
@@ -439,7 +439,7 @@ A backend must be created to instruct Astra Trident about the Azure NetApp Files
       name: backend-tbc-anf-secret
     type: Opaque
     stringData:
-      clientID: abcde356-bf8e-fake-c111-abcde35613aa
+      clientID: 00001111-aaaa-2222-bbbb-3333cccc4444
       clientSecret: rR0rUmWXfNioN1KhtHisiSAnoTherboGuskey6pU
     ``` 
 
@@ -453,8 +453,8 @@ A backend must be created to instruct Astra Trident about the Azure NetApp Files
     spec:
       version: 1
       storageDriverName: azure-netapp-files
-      subscriptionID: 12abc678-4774-fake-a1b2-a7abcde39312
-      tenantID: a7abcde3-edc1-fake-b111-a7abcde356cf
+      subscriptionID: aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e
+      tenantID: aaaabbbb-0000-cccc-1111-dddd2222eeee
       location: eastus
       serviceLevel: Premium
       credentials:
@@ -778,4 +778,3 @@ Astra Trident supports many features with Azure NetApp Files. For more informati
 [install-azure-cli]: /cli/azure/install-azure-cli
 [use-tags]: use-tags.md
 [azure-ad-app-registration]: ../active-directory/develop/howto-create-service-principal-portal.md
-
diff --git a/articles/aks/configure-kubenet.md b/articles/aks/configure-kubenet.md
@@ -198,7 +198,7 @@ If you're using the Azure CLI, the role is automatically added and you can skip
     az role assignment create --assignee <control-plane-identity-principal-id> --scope $VNET_ID --role "Network Contributor"
 
     # Example command
-    az role assignment create --assignee 22222222-2222-2222-2222-222222222222 --scope "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myAKSVnet" --role "Network Contributor"
+    az role assignment create --assignee 22222222-2222-2222-2222-222222222222 --scope "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myAKSVnet" --role "Network Contributor"
     ```
 
 > [!NOTE]

diff --git a/articles/aks/create-mongodb-infrastructure.md b/articles/aks/create-mongodb-infrastructure.md
@@ -208,7 +208,7 @@ In the following steps, you create an AKS cluster with a workload identity and O
     ```output
     CreatedBy                             CreatedOn                         Name                                  PrincipalId                           PrincipalName                         PrincipalType     ResourceGroup                     RoleDefinitionId                                                                                                                            RoleDefinitionName    Scope                                                                                                                                                                      UpdatedBy                             UpdatedOn
     ------------------------------------  --------------------------------  ------------------------------------  ------------------------------------  ------------------------------------  ----------------  --------------------------------  ------------------------------------------------------------------------------------------------------------------------------------------  --------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------  ------------------------------------  --------------------------------
-    d3a2023b-03fe-41bb-8b6f-08fb78ac4da6  2024-07-01T12:23:20.749750+00:00  8247e9bb-bc6b-414f-98a6-4768dbb961ad  9686a88e-25bc-4b4c-b611-d1057a26acdc  0b40421c-343b-4986-b691-980d6154429e  ServicePrincipal  myResourceGroup-rg-australiaeast  /subscriptions/83a15f8c-a05a-4cf3-b4bb-f6bcd6dbbfa9/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d  AcrPull               /subscriptions/83a15f8c-a05a-4cf3-b4bb-f6bcd6dbbfa9/resourceGroups/myResourceGroup-rg-australiaeast/providers/Microsoft.ContainerRegistry/registries/mydnsrandomnamecjcfc  d3a2023b-03fe-41bb-8b6f-08fb78ac4da6  2024-07-01T12:23:20.749750+00:00
+    bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f  2024-07-01T12:23:20.749750+00:00  8247e9bb-bc6b-414f-98a6-4768dbb961ad  9686a88e-25bc-4b4c-b611-d1057a26acdc  0b40421c-343b-4986-b691-980d6154429e  ServicePrincipal  myResourceGroup-rg-australiaeast  /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d  AcrPull               /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup-rg-australiaeast/providers/Microsoft.ContainerRegistry/registries/mydnsrandomnamecjcfc  bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f  2024-07-01T12:23:20.749750+00:00
     ```
 
 ## Connect to the AKS cluster

diff --git a/articles/aks/create-nginx-ingress-private-controller.md b/articles/aks/create-nginx-ingress-private-controller.md
@@ -243,7 +243,7 @@ The following example output shows the created record:
     ],
     "etag": "ecc303c5-4577-4ca2-b545-d34e160d1c2d",
     "fqdn": "store-front.private.contoso.com.",
-    "id": "/subscriptions/68ed2a89-5b8a-45e0-b2f9-65b8fa556333/resourceGroups/test-rg/providers/Microsoft.Network/privateDnsZones/private.contoso.com/A/store-front",
+    "id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/test-rg/providers/Microsoft.Network/privateDnsZones/private.contoso.com/A/store-front",
     "isAutoRegistered": false,
     "name": "store-front",
     "resourceGroup": "test-rg",
@@ -280,4 +280,3 @@ For other configuration information related to SSL encryption other advanced NGI
 [az-network-private-dns-zone-create]: /cli/azure/network/private-dns/zone?#az-network-private-dns-zone-create
 [az-network-private-dns-link-vnet-create]: /cli/azure/network/private-dns/link/vnet#az-network-private-dns-link-vnet-create
 [az-network-private-dns-record-set-a-list]: /cli/azure/network/private-dns/record-set/a#az-network-private-dns-record-set-a-list
-
diff --git a/articles/aks/create-postgresql-ha.md b/articles/aks/create-postgresql-ha.md
@@ -381,7 +381,7 @@ The Azure Monitor workspace for Managed Prometheus and Azure Managed Grafana are
     {
       "omsagent": {
         "config": {
-          "logAnalyticsWorkspaceResourceID": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-cnpg-9vbin3p8/providers/Microsoft.OperationalInsights/workspaces/ala-cnpg-9vbin3p8",
+          "logAnalyticsWorkspaceResourceID": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/rg-cnpg-9vbin3p8/providers/Microsoft.OperationalInsights/workspaces/ala-cnpg-9vbin3p8",
           "useAADAuth": "true"
         },
         "enabled": true,

diff --git a/articles/aks/create-valkey-infrastructure.md b/articles/aks/create-valkey-infrastructure.md
@@ -149,7 +149,7 @@ In this step, we create an AKS cluster. We enable the Azure KeyVault Secret Prov
     ```output
     CreatedBy                             CreatedOn                         Name                                  PrincipalId                           PrincipalName                         PrincipalType     ResourceGroup       RoleDefinitionId                                                                                                                            RoleDefinitionName    Scope                                                                                                                                                        UpdatedBy                             UpdatedOn
     ------------------------------------  --------------------------------  ------------------------------------  ------------------------------------  ------------------------------------  ----------------  ------------------  ------------------------------------------------------------------------------------------------------------------------------------------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------  ------------------------------------  --------------------------------
-    ffc55a9e-ed2a-4b60-b034-45228dfe7db5  2024-06-11T09:41:36.631310+00:00  04628c5e-371a-49b8-8462-4ecd7f90a43f  6a9a8328-7257-4db2-8c4f-169687f36556  94fa3265-4ac2-4e19-8516-f3e830642ca8  ServicePrincipal  myResourceGroup-rg  /subscriptions/9b70acd9-975f-44ba-bad6-255a2c8bda37/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d  AcrPull               /subscriptions/9b70acd9-975f-44ba-bad6-255a2c8bda37/resourceGroups/myResourceGroup-rg/providers/Microsoft.ContainerRegistry/registries/mydnsrandomnamebbbhe  ffc55a9e-ed2a-4b60-b034-45228dfe7db5  2024-06-11T09:41:36.631310+00:00
+    bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f  2024-06-11T09:41:36.631310+00:00  04628c5e-371a-49b8-8462-4ecd7f90a43f  6a9a8328-7257-4db2-8c4f-169687f36556  94fa3265-4ac2-4e19-8516-f3e830642ca8  ServicePrincipal  myResourceGroup-rg  /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d  AcrPull               /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup-rg/providers/Microsoft.ContainerRegistry/registries/mydnsrandomnamebbbhe  bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f  2024-06-11T09:41:36.631310+00:00
     ```
 
 ## Create a node pool for the Valkey workload

diff --git a/articles/aks/csi-disk-move-subscriptions.md b/articles/aks/csi-disk-move-subscriptions.md
@@ -113,7 +113,7 @@ To mount the moved disk volume, create a static persistent volume with the resou
       csi:
         driver: disk.csi.azure.com
         readOnly: false
-        volumeHandle: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MC_rg_azure_aks-pvc-target_eastus/providers/Microsoft.Compute/disks/pvc-501cb814-dbf7-4f01-b4a2-dc0d5b6c7e7a
+        volumeHandle: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MC_rg_azure_aks-pvc-target_eastus/providers/Microsoft.Compute/disks/pvc-aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e
         volumeAttributes:
           fsType: ext4
     ```

diff --git a/articles/aks/learn/quick-kubernetes-deploy-powershell.md b/articles/aks/learn/quick-kubernetes-deploy-powershell.md
@@ -51,7 +51,7 @@ The following example creates a resource group named *myResourceGroup* in the *e
     Location          : eastus
     ProvisioningState : Succeeded
     Tags              :
-    ResourceId        : /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup
+    ResourceId        : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup
     ```
 
 ## Create AKS cluster
@@ -434,4 +434,3 @@ To learn more about AKS and walk through a complete code-to-deployment example,
 [azure-resource-group]: /azure/azure-resource-manager/management/overview
 [baseline-reference-architecture]: /azure/architecture/reference-architectures/containers/aks/baseline-aks?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
 [aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
-
diff --git a/articles/aks/learn/quick-windows-container-deploy-powershell.md b/articles/aks/learn/quick-windows-container-deploy-powershell.md
@@ -46,7 +46,7 @@ ResourceGroupName : myResourceGroup
 Location          : eastus
 ProvisioningState : Succeeded
 Tags              :
-ResourceId        : /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup
+ResourceId        : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup
 ```
 
 ## Create an AKS cluster

diff --git a/articles/aks/network-observability-managed-cli.md b/articles/aks/network-observability-managed-cli.md
@@ -110,7 +110,7 @@ Wait for the feature to say **Registered** before preceding with the article.
 
 ```output
 {
-  "id": "/subscriptions/23250d6d-28f0-41dd-9776-61fc80805b6e/providers/Microsoft.Features/providers/Microsoft.ContainerService/features/NetworkObservabilityPreview",
+  "id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Features/providers/Microsoft.ContainerService/features/NetworkObservabilityPreview",
   "name": "Microsoft.ContainerService/NetworkObservabilityPreview",
   "properties": {
     "state": "Registering"

diff --git a/articles/aks/tutorial-kubernetes-scale.md b/articles/aks/tutorial-kubernetes-scale.md
@@ -203,7 +203,7 @@ The following example increases the number of nodes to three in the Kubernetes c
     AgentPoolProfiles        : {default}
     ...
     ResourceGroupName        : myResourceGroup
-    Id                       : /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/Mic
+    Id                       : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/myResourceGroup/providers/Mic
                                rosoft.ContainerService/managedClusters/myAKSCluster
     Name                     : myAKSCluster
     Type                     : Microsoft.ContainerService/ManagedClusters
@@ -243,4 +243,3 @@ In the next tutorial, you learn how to upgrade Kubernetes in your AKS cluster.
 [set-azakscluster]: /powershell/module/az.aks/set-azakscluster
 [aks-tutorial-upgrade-kubernetes]: ./tutorial-kubernetes-upgrade-cluster.md
 [keda-addon]: ./keda-about.md
-
diff --git a/articles/aks/use-oidc-issuer.md b/articles/aks/use-oidc-issuer.md
@@ -99,7 +99,7 @@ The output should resemble the following:
 
 ```output
 {
-  "issuer": "https://eastus.oic.prod-aks.azure.com/00000000-0000-0000-0000-000000000000/00000000-0000-0000-0000-000000000000/",
+  "issuer": "https://eastus.oic.prod-aks.azure.com/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/00000000-0000-0000-0000-000000000000/",
   "jwks_uri": "https://eastus.oic.prod-aks.azure.com/00000000-0000-0000-0000-000000000000/00000000-0000-0000-0000-000000000000/openid/v1/jwks",
   "response_types_supported": [
     "id_token"