Merge pull request #235088 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/aks/csi-secrets-store-driver.md

@@ -115,7 +115,7 @@ In addition to an AKS cluster, you'll need an Azure key vault resource that stor
 The Secrets Store CSI Driver allows for the following methods to access an Azure key vault:
 
 * An [Azure Active Directory pod identity][aad-pod-identity] (preview)
-* An [Azure Active Directory workload identity][aad-workload-identity] (preview)
+* An [Azure Active Directory workload identity][aad-workload-identity]
 * A user-assigned or system-assigned managed identity
 
 Follow the instructions in [Provide an identity to access the Azure Key Vault Provider for Secrets Store CSI Driver][identity-access-methods] for your chosen method.

articles/aks/ingress-tls.md

@@ -130,7 +130,8 @@ When you upgrade your ingress controller, you must pass a parameter to the Helm
     helm upgrade ingress-nginx ingress-nginx/ingress-nginx \
       --namespace $NAMESPACE \
       --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"=$DNS_LABEL \
-      --set controller.service.loadBalancerIP=$STATIC_IP
+      --set controller.service.loadBalancerIP=$STATIC_IP \
+      --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz
     ```
 
 ### [Azure PowerShell](#tab/azure-powershell)
@@ -165,7 +166,8 @@ When you upgrade your ingress controller, you must pass a parameter to the Helm
     helm upgrade ingress-nginx ingress-nginx/ingress-nginx `
       --namespace $Namespace `
       --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"=$DnsLabel `
-      --set controller.service.loadBalancerIP=$StaticIP
+      --set controller.service.loadBalancerIP=$StaticIP `
+      --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz
     ```
 
 ---
@@ -292,7 +294,8 @@ NAMESPACE="ingress-basic"
 
 helm upgrade ingress-nginx ingress-nginx/ingress-nginx \
   --namespace $NAMESPACE \
-  --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"=$DNSLABEL
+  --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"=$DNSLABEL \
+  --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz
 ```
 
 ### [Azure PowerShell](#tab/azure-powershell)
@@ -303,7 +306,8 @@ $Namespace = "ingress-basic"
 
 helm upgrade ingress-nginx ingress-nginx/ingress-nginx `
   --namespace $Namespace `
-  --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"=$DnsLabel
+  --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"=$DnsLabel `
+  --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz
 ```
 
 ---

articles/aks/static-ip.md

@@ -79,7 +79,7 @@ This article shows you how to create a static public IP address and assign it to
       loadBalancerIP: 40.121.183.52
       type: LoadBalancer
       ports:
-     - port: 80
+      - port: 80
       selector:
         app: azure-load-balancer
     ```

articles/azure-maps/how-to-render-custom-data.md

@@ -30,7 +30,7 @@ The following are examples of custom data:
 
 This article uses the [Postman] application, but you may use a different API development environment.
 
-We'll use the Azure Maps [Data service] to store and render overlays.
+Use the Azure Maps [Data service] to store and render overlays.
 
 ## Render pushpins with labels and a custom image
 
@@ -67,7 +67,7 @@ To get a static image with custom pins and labels:
 > [!NOTE]
 > The procedure in this section requires an Azure Maps account Gen 1 (S1) or Gen 2 pricing tier.
 
-In this section, we'll upload path and pin data to Azure Map data storage.
+In this section, you upload path and pin data to Azure Map data storage.
 
 To upload pins and path data:
 
@@ -245,7 +245,7 @@ To render a polygon with color and opacity:
 > [!NOTE]
 > The procedure in this section requires an Azure Maps account Gen 1 (S1) or Gen 2 pricing tier.
 
-You can modify the appearance of the pins by adding style modifiers. For example, to make pushpins and their labels larger or smaller, use the `sc` "scale style" modifier. This modifier takes a value that's greater than zero. A value of 1 is the standard scale. Values larger than 1 will make the pins larger, and values smaller than 1 will make them smaller. For more information about style modifiers, see [static image service path parameters].
+You can modify the appearance of the pins by adding style modifiers. For example, to make pushpins and their labels larger or smaller, use the `sc` "scale style" modifier. This modifier takes a value that's greater than zero. A value of 1 is the standard scale. Values larger than 1 makes the pins larger, and values smaller than 1 makes them smaller. For more information about style modifiers, see [static image service path parameters].
 
 To render a circle and pushpins with custom labels:
 
@@ -269,7 +269,7 @@ To render a circle and pushpins with custom labels:
 
     :::image type="content" source="./media/how-to-render-custom-data/circle-custom-pins.png" alt-text="Render a circle with custom pushpins.":::
 
-8. Now we'll change the color of the pushpins by modifying the `co` style modifier. If you look at the value of the `pins` parameter (`pins=default|la15+50|al0.66|lc003C62|co002D62|`), you'll see that the current color is `#002D62`. To change  the color to `#41d42a`, we'll replace `#002D62` with `#41d42a`.  Now the `pins` parameter is `pins=default|la15+50|al0.66|lc003C62|co41D42A|`. The request  looks like the following URL:
+8. Next, change the color of the pushpins by modifying the `co` style modifier. If you look at the value of the `pins` parameter (`pins=default|la15+50|al0.66|lc003C62|co002D62|`), notice that the current color is `#002D62`. To change  the color to `#41d42a`, replace `#002D62` with `#41d42a`.  Now the `pins` parameter is `pins=default|la15+50|al0.66|lc003C62|co41D42A|`. The request  looks like the following URL:
 
     ```HTTP
     https://atlas.microsoft.com/map/static/png?api-version=1.0&style=main&layer=basic&zoom=14&height=700&Width=700&center=-122.13230609893799,47.64599069048016&path=lcFF0000|lw2|la0.60|ra1000||-122.13230609893799 47.64599069048016&pins=default|la15+50|al0.66|lc003C62|co41D42A||'Microsoft Corporate Headquarters'-122.14131832122801  47.64690503939462|'Microsoft Visitor Center'-122.136828 47.642224|'Microsoft Conference Center'-122.12552547454833 47.642940335653996|'Microsoft The Commons'-122.13687658309935  47.64452336193245&subscription-key={Your-Azure-Maps-Subscription-key}
@@ -285,17 +285,20 @@ Similarly, you can change, add, and remove other style modifiers.
 
 ## Next steps
 
-- Explore the [Azure Maps Get Map Image API] documentation.
-- To learn more about Azure Maps Data service, see the [service documentation].
+> [!div class="nextstepaction"]
+> [Render - Get Map Image]
+
+> [!div class="nextstepaction"]
+> [Data service]
+
 
 [Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
-[Subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account
-[Postman]: https://www.postman.com/
+[Render - Get Map Image]: /rest/api/maps/render/getmapimage
 [Data service]: /rest/api/maps/data
-[static image service]: /rest/api/maps/render/getmapimage
 [Data Upload]: /rest/api/maps/data-v2/upload
-[Render service]: /rest/api/maps/render/get-map-image
 [path parameter]: /rest/api/maps/render/getmapimage#uri-parameters
-[Azure Maps Get Map Image API]: /rest/api/maps/render/getmapimage
-[service documentation]: /rest/api/maps/data
+[Postman]: https://www.postman.com/
+[Render service]: /rest/api/maps/render/get-map-image
 [static image service path parameters]: /rest/api/maps/render/getmapimage#uri-parameters
+[static image service]: /rest/api/maps/render/getmapimage
+[Subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account