Merge pull request #263940 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

.openpublishing.publish.config.json

@@ -1214,6 +1214,7 @@
   ".openpublishing.redirection.defender-for-cloud.json",
   ".openpublishing.redirection.defender-for-iot.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
+  "articles/site-recovery/.openpublishing.redirection.site-recovery.json",
   ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
   ".openpublishing.redirection.machine-configuration.json",

.openpublishing.redirection.json

@@ -88,15 +88,15 @@ If you navigated away from the **Deployment is in progress** page, the following
    * `cmdToConnectToCluster`
    * `appDeploymentTemplateYaml` if you select **No** to **Deploy an application?** when deploying the Marketplace offer; or `appDeploymentYaml` if you select **yes** to **Deploy an application?**.
 
-   ### [Bash](#tab/in-bash)
+    # [Bash](#tab/in-bash)
 
-   Paste the value of `appDeploymentTemplateYaml` or `appDeploymentYaml` into a Bash shell, append `| grep secretName`, and execute. This command will output the Ingress TLS secret name, such as `- secretName: secret785e2c`. Save aside the value for `secretName` from the output.
+    Paste the value of `appDeploymentTemplateYaml` or `appDeploymentYaml` into a Bash shell, append `| grep secretName`, and execute. This command will output the Ingress TLS secret name, such as `- secretName: secret785e2c`. Save aside the value for `secretName` from the output.
 
-   ### [PowerShell](#tab/in-powershell)
+    # [PowerShell](#tab/in-powershell)
 
-   Paste the quoted string in `appDeploymentTemplateYaml` or `appDeploymentYaml` into a PowerShell, append `| ForEach-Object { [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($_)) } | Select-String "secretName"`, and execute. This command will output the Ingress TLS secret name, such as `- secretName: secret785e2c`. Save aside the value for `secretName` from the output.
+    Paste the quoted string in `appDeploymentTemplateYaml` or `appDeploymentYaml` into a PowerShell, append `| ForEach-Object { [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($_)) } | Select-String "secretName"`, and execute. This command will output the Ingress TLS secret name, such as `- secretName: secret785e2c`. Save aside the value for `secretName` from the output.
 
-   ---
+    ---
 
 These values will be used later in this article. Note that several other useful commands are listed in the outputs.
 
@@ -170,7 +170,7 @@ In directory *liberty/config*, the *server.xml* file is used to configure the DB
 
 Now that you've gathered the necessary properties, you can build the application. The POM file for the project reads many variables from the environment. As part of the Maven build, these variables are used to populate values in the YAML files located in *src/main/aks*. You can do something similar for your application outside Maven if you prefer.
 
-### [Bash](#tab/in-bash)
+# [Bash](#tab/in-bash)
 
 ```bash
 cd <path-to-your-repo>/java-app
@@ -189,7 +189,7 @@ export INGRESS_TLS_SECRET=<ingress-TLS-secret-name>
 mvn clean install
 ```
 
-### [PowerShell](#tab/in-powershell)
+# [PowerShell](#tab/in-powershell)
 
 ```powershell
 cd <path-to-your-repo>/java-app
@@ -206,7 +206,6 @@ $Env:DB_PASSWORD=<server-admin-password>
 $Env:INGRESS_TLS_SECRET=<ingress-TLS-secret-name>
 
 mvn clean install
-
 ```
 
 ---
@@ -242,29 +241,29 @@ You can now use the following steps to test the Docker image locally before depl
 
 1. Run the image using the following command. Note we're using the environment variables defined previously.
 
-   ### [Bash](#tab/in-bash)
+    # [Bash](#tab/in-bash)
 
-   ```bash
-   docker run -it --rm -p 9080:9080 \
-      -e DB_SERVER_NAME=${DB_SERVER_NAME} \
-      -e DB_NAME=${DB_NAME} \
-      -e DB_USER=${DB_USER} \
-      -e DB_PASSWORD=${DB_PASSWORD} \
-      javaee-cafe:v1
-   ```
+    ```bash
+    docker run -it --rm -p 9080:9080 \
+       -e DB_SERVER_NAME=${DB_SERVER_NAME} \
+       -e DB_NAME=${DB_NAME} \
+       -e DB_USER=${DB_USER} \
+       -e DB_PASSWORD=${DB_PASSWORD} \
+       javaee-cafe:v1
+    ```
 
-   ### [PowerShell](#tab/in-powershell)
+    # [PowerShell](#tab/in-powershell)
 
-   ```powershell
-   docker run -it --rm -p 9080:9080 `
-      -e DB_SERVER_NAME=${Env:DB_SERVER_NAME} `
-      -e DB_NAME=${Env:DB_NAME} `
-      -e DB_USER=${Env:DB_USER} `
-      -e DB_PASSWORD=${Env:DB_PASSWORD} `
-      javaee-cafe:v1
-   ```
+    ```powershell
+    docker run -it --rm -p 9080:9080 `
+       -e DB_SERVER_NAME=${Env:DB_SERVER_NAME} `
+       -e DB_NAME=${Env:DB_NAME} `
+       -e DB_USER=${Env:DB_USER} `
+       -e DB_PASSWORD=${Env:DB_PASSWORD} `
+       javaee-cafe:v1
+    ```
 
-   ---
+    ---
 
 1. Once the container starts, go to `http://localhost:9080/` in your browser to access the application.
 
@@ -274,15 +273,15 @@ You can now use the following steps to test the Docker image locally before depl
 
 Upload the built image to the ACR created in the offer.
 
-### [Bash](#tab/in-bash)
+# [Bash](#tab/in-bash)
 
 ```bash
 docker tag javaee-cafe:v1 ${LOGIN_SERVER}/javaee-cafe:v1
 docker login -u ${USER_NAME} -p ${PASSWORD} ${LOGIN_SERVER}
 docker push ${LOGIN_SERVER}/javaee-cafe:v1
 ```
 
-### [PowerShell](#tab/in-powershell)
+# [PowerShell](#tab/in-powershell)
 
 ```powershell
 docker tag javaee-cafe:v1 ${Env:LOGIN_SERVER}/javaee-cafe:v1
@@ -342,36 +341,36 @@ Use the following steps to deploy and test the application:
 
    1. Go to `https://<ADDRESS>` to test the application. For your convenience, this shell command will create an environment variable whose value you can paste straight into the browser.
 
-      ### [Bash](#tab/in-bash)
+       # [Bash](#tab/in-bash)
 
-      ```bash
-      export APP_URL=https://$(kubectl get ingress | grep javaee-cafe-cluster-agic-ingress | cut -d " " -f14)/
-      echo $APP_URL
-      ```
+       ```bash
+       export APP_URL=https://$(kubectl get ingress | grep javaee-cafe-cluster-agic-ingress | cut -d " " -f14)/
+       echo $APP_URL
+       ```
 
-      ### [PowerShell](#tab/in-powershell)
+       # [PowerShell](#tab/in-powershell)
 
-      ```powershell
-      $APP_URL = "https://$(kubectl get ingress | Select-String 'javaee-cafe-cluster-agic-ingress' | ForEach-Object { $_.Line.Split(' ')[13] })/"
-      $APP_URL
-      ```
+       ```powershell
+       $APP_URL = "https://$(kubectl get ingress | Select-String 'javaee-cafe-cluster-agic-ingress' | ForEach-Object { $_.Line.Split(' ')[13] })/"
+       $APP_URL
+       ```
 
-      ---
+       ---
 
       If the web page doesn't render correctly or returns a `502 Bad Gateway` error, that's because the app is still starting in the background. Wait for a few minutes and then try again.
 
 ## Clean up resources
 
 To avoid Azure charges, you should clean up unnecessary resources. When the cluster is no longer needed, use the [az group delete](/cli/azure/group#az-group-delete) command to remove the resource group, container service, container registry, and all related resources.
 
-### [Bash](#tab/in-bash)
+# [Bash](#tab/in-bash)
 
 ```bash
 az group delete --name $RESOURCE_GROUP_NAME --yes --no-wait
 az group delete --name <db-resource-group> --yes --no-wait
 ```
 
-### [PowerShell](#tab/in-powershell)
+# [PowerShell](#tab/in-powershell)
 
 ```powershell
 az group delete --name $Env:RESOURCE_GROUP_NAME --yes --no-wait

articles/aks/howto-deploy-java-liberty-app.md

@@ -5,7 +5,7 @@ ms.topic: article
 ms.custom:
   - devx-track-azurecli
   - ignite-2023
-ms.date: 07/31/2023
+ms.date: 01/22/2024
 ---
 
 # Use a managed identity in Azure Kubernetes Service (AKS)
@@ -59,6 +59,8 @@ AKS uses several managed identities for built-in services and add-ons.
 
 > [!NOTE]
 > AKS creates a user-assigned kubelet identity in the node resource group if you don't [specify your own kubelet managed identity][use-a-pre-created-kubelet-managed-identity].
+>
+> If your cluster already uses a managed identity and you change that identity, for example, updating from a system-assigned identity to a user-assigned identity, or updating to a different user-assigned identity, there's a delay for the control plane components to switch to the new identity. The control plane components continue using the old identity until its token expires. After the token refreshes, the control plane switches to use the new identity. This process can take several hours.
 
 1. Create an Azure resource group using the [`az group create`][az-group-create] command.
 

articles/aks/use-managed-identity.md

@@ -1,16 +1,18 @@
 ---
-title: Support Matrix for Azure file share backup
+title: Support Matrix for Azure file share backup by using Azure Backup
 description: Provides a summary of support settings and limitations when backing up Azure file shares.
 ms.topic: conceptual
-ms.date: 10/14/2022
-ms.custom: references_regions
+ms.date: 04/27/2023
+ms.custom: references_regions, engagement-fy24
 ms.service: backup
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
 ---
 
 # Support matrix for Azure file share backup
 
+This article summarizes the supported settings and limitations when backing up Azure file shares by using Azure Backup.
+
 You can use the [Azure Backup service](./backup-overview.md) to back up Azure file shares. This article summarizes support settings when you back up Azure file shares with Azure Backup.
 
 > [!NOTE]