Merge branch 'v0.31' into re/presenattion

.github/workflows/website.yaml

@@ -12,6 +12,10 @@ on:
       - edge
       - v*.*
 
+permissions:
+  id-token: write # Required for requesting the JWT
+  contents: read  # Required for actions/checkout
+
 jobs:
   build:
     name: Build Hugo Website
@@ -95,13 +99,12 @@ jobs:
         with:
           name: hugo_build
           path: site/
-      - name: az CLI login
-        run: |
-          az login --service-principal \
-            --username ${{ secrets.AZURE_SP_TESTS_APPID }} \
-            --password ${{ secrets.AZURE_SP_TESTS_PASSWORD }} \
-            --tenant ${{ secrets.AZURE_SP_TESTS_TENANTID }}
-          az account set --subscription ${{ vars.ENV_APPSERVICE_SUBSCRIPTIONID }}
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_SP_TESTS_APPID }}
+          tenant-id: ${{ secrets.AZURE_SP_TESTS_TENANTID }}
+          subscription-id: ${{ vars.ENV_APPSERVICE_SUBSCRIPTIONID }}
       - name: Deploy to WebApp
         uses: Azure/webapps-deploy@v2
         with:
@@ -134,7 +137,6 @@ jobs:
           output_location: ""
           skip_app_build: true
 
-
   close_pr_site:
     name: Close PR Staging Site
     if: github.event_name == 'pull_request' && github.event.action == 'closed'

docs/content/tutorials/tutorial-add-radius/index.md

@@ -151,7 +151,7 @@ Step 2: Deploy and test the existing Guestbook application using `kubectl`
 
 You will now add Radius to the Guestbook application's Kubernetes deployment manifests by making edits to the YAML files in the `deploy` directory. 
 
-1. In each of the YAML files that contain a manifest for `Kind: Deployment`, add the `annotations` property to `metadata`, and then add the `rad.app/enabled: 'true'` annotation. Note that the `'true'` must be surrounded in quotes.
+1. In each of the YAML files that contain a manifest for `Kind: Deployment`, add the `annotations` property to `metadata`, and then add the `radapp.io/enabled: 'true'` annotation. Note that the `'true'` must be surrounded in quotes.
 
    ```yaml
    ...
@@ -179,7 +179,7 @@ You will now add Radius to the Guestbook application's Kubernetes deployment man
    metadata:
       name: frontend
       annotations:
-         rad.app/enabled: 'true'
+         radapp.io/enabled: 'true'
    spec:
    selector:
       matchLabels: