From f0a217e645964b6d4a629a43aad78d98f0c464cd Mon Sep 17 00:00:00 2001 From: Will Smith Date: Mon, 18 Mar 2024 07:09:05 -0700 Subject: [PATCH 1/3] Fix wrong kubernetes label in incremental adoption docs (#1085) Signed-off-by: Will Smith --- docs/content/tutorials/tutorial-add-radius/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/tutorials/tutorial-add-radius/index.md b/docs/content/tutorials/tutorial-add-radius/index.md index 3e822762c..6f5a3bd12 100644 --- a/docs/content/tutorials/tutorial-add-radius/index.md +++ b/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: From 829f32a55b004f93582c3e7b0f81334de99a5f2a Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Mon, 18 Mar 2024 08:36:14 -0700 Subject: [PATCH 2/3] Switch to OIDC auth (#1086) Signed-off-by: Aaron Crawfis --- .github/workflows/website.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index 498e49e6c..fd87dfee3 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -95,13 +95,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 +133,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' From dcec18da74c8ea48274c080b173c4d89f57fb112 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Mon, 18 Mar 2024 08:40:50 -0700 Subject: [PATCH 3/3] Fix workflow permissions Signed-off-by: Aaron Crawfis --- .github/workflows/website.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index fd87dfee3..d016b4715 100644 --- a/.github/workflows/website.yaml +++ b/.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