Merge branch 'edge' into jasonviviano/kubernetes-incremental-guide

.devcontainer/devcontainer.json

@@ -14,7 +14,6 @@
 	"settings": {
 		"terminal.integrated.defaultProfile.linux": "bash"
 	},
-	"onCreateCommand": "bash ./.devcontainer/on-create.sh",
 	"postCreateCommand": "bash .devcontainer/post-create.sh",
 	"customizations": {
 		"codespaces": {
@@ -31,7 +30,7 @@
 			"settings": {},
 			"extensions": [
 				"GitHub.copilot",
-				"/tmp/rad-vscode-bicep.vsix"
+				"ms-azuretools.rad-vscode-bicep"
 			]
 		  }
 	}, 

.gitattributes

@@ -6,3 +6,9 @@
 
 # images are binary
 *.png binary
+
+# MS Office documents are binary
+*.pptx binary
+*.potx binary
+*.docx binary
+*.dotx binary

.github/config/en-custom.txt

@@ -241,6 +241,7 @@ lifecycles
 linkTitle
 linter
 linux
+lineNos
 liveness
 livenessProbe
 localWorkspace
@@ -317,6 +318,7 @@ redoc
 resourceGroup
 replacePrefix
 repo
+repos
 resourceGroupName
 RecipeSpecified
 resourceId
@@ -987,6 +989,7 @@ learnings
 architected
 customizable
 Gitops
+GitLab
 OSS
 SRE
 SREs
@@ -1230,3 +1233,16 @@ natively
 NuGet
 KubeVela
 GigaOm
+potx
+href
+RecipeConfigProperties
+recipeConfig
+TerraformConfigProperties
+AuthConfig
+GitAuthConfig
+GitAuthConfigPat
+SecretConfig
+appgraph
+EnvironmentVariables
+TerraformConfigPropertiesProviders
+ProviderConfigProperties

.github/workflows/close-stale-prs.yml

@@ -0,0 +1,27 @@
+# This workflow warns and then closes PRs that have had no activity for 90 days.
+#
+# For more information, see:
+# https://github.com/actions/stale
+name: Close stale pull requests
+
+on:
+  schedule:
+  - cron: '0 18 * * *' # Run the workflow every day at 6PM UTC (10AM PST).
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-pr-message: 'This pull request has been automatically marked as stale because it has been inactive for 90 days. Remove stale label or comment or this PR will be closed in 7 days.'
+        stale-pr-label: 'stale'
+        days-before-pr-stale: 90 # 3 months
+        days-before-pr-close: 7
+        days-before-issue-stale: -1
+        days-before-issue-close: -1

.github/workflows/release.yaml

@@ -45,5 +45,5 @@ jobs:
           --method PATCH \
           -H "Accept: application/vnd.github+json" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          /repos/radius-project/docs \
+          repos/radius-project/docs \
           -f default_branch='v${{ steps.parse_release_channel.outputs.channel }}'

.github/workflows/website.yaml

@@ -12,13 +12,18 @@ on:
       - edge
       - v*.*
 
+permissions:
+  id-token: write # Required for requesting the JWT
+  contents: read  # Required for actions/checkout
+
 jobs:
   build:
     name: Build Hugo Website
     if: github.event.action != 'closed'
     runs-on: ubuntu-latest
     environment:
-      name: ${{ github.ref_name == 'edge' && 'edge' || 'latest' }}
+      # If a PR into edge, use 'edge'. If a PR into anywhere else, use 'latest'. If a push, use the branch name.
+      name: ${{ github.event_name == 'pull_request' && (github.base_ref == 'edge' && 'edge' || 'latest') || github.ref_name }}
     env:
       GOVER: '^1.17'
       TUTORIAL_PATH: './docs/content/user-guides/tutorials/'
@@ -58,6 +63,11 @@ jobs:
         run : |
           mkdir -p ./docs/static/swagger
           cp -r ./radius/swagger ./docs/static/
+      - name: Override git_branch for PR
+        if: github.event_name == 'pull_request'
+        run: |
+          # Within docs/config.toml, replace the line that starts with "github_branch" with "github_branch: $GITHUB_HEAD_REF"
+          sed -i "s|github_branch = .*|github_branch = \"$GITHUB_HEAD_REF\"|" docs/config.toml
       - name: Build Hugo Site
         run: |
           cd docs
@@ -78,6 +88,7 @@ jobs:
     needs: ['build']
     runs-on: ubuntu-latest
     environment:
+      # If push to edge, use 'edge'. If push to anywhere else, use 'latest'.
       name: ${{ github.ref_name == 'edge' && 'edge' || 'latest' }}
       url: ${{ github.ref_name == 'edge' && 'https://edge.docs.radapp.io' || 'https://docs.radapp.io' }}
     steps:
@@ -90,13 +101,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:
@@ -109,8 +119,10 @@ jobs:
     needs: ['build']
     runs-on: ubuntu-latest
     environment:
-      name: ${{ github.ref_name == 'edge' && 'edge' || 'latest' }}
-      url: ${{ github.ref_name == 'edge' && 'https://edge.docs.radapp.io' || 'https://docs.radapp.io' }}
+      # If a PR or push into edge, use 'edge'. If a PR or push into anywhere else, use 'latest'.
+      name: ${{ github.event_name == 'pull_request' && (github.base_ref == 'edge' && 'edge' || 'latest') || (github.ref_name == 'edge' && 'edge' || 'latest') }}
+      # If a push to edge, use the edge URL. If a push to anywhere else, use the latest URL. If a PR, blank.
+      url: ${{ github.event_name == 'pull_request' && '' || (github.ref_name == 'edge' && 'https://edge.docs.radapp.io' || 'https://docs.radapp.io') }}
     steps:
       - name: Download Hugo artifacts
         uses: actions/download-artifact@v3
@@ -129,14 +141,14 @@ 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'
     runs-on: ubuntu-latest
     environment:
-      name: ${{ github.ref_name == 'edge' && 'edge' || 'latest' }}
-      url: ${{ github.ref_name == 'edge' && 'https://edge.docs.radapp.io' || 'https://docs.radapp.io' }}
+      # If a PR into edge, use 'edge'. If a PR into anywhere else, use 'latest'.
+      name: ${{ github.base_ref == 'edge' && 'edge' || 'latest' }}
+      url:  ${{ github.base_ref == 'edge' && 'https://edge.docs.radapp.io' || 'https://docs.radapp.io' }}
     steps:
       - name: Close Pull Request
         id: closepullrequest
@@ -152,6 +164,7 @@ jobs:
     needs: ['build', 'deploy']
     runs-on: ubuntu-latest
     environment:
+      # If push to edge, use 'edge'. If push to anywhere else, use 'latest'.
       name: ${{ github.ref_name == 'edge' && 'edge' || 'latest' }}
     env:
       ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_API_APPID }}

CONTRIBUTING.md

@@ -21,3 +21,7 @@ $ git commit -s -m 'This is my commit message'
 ```
 
 Visual Studio Code has a setting, `git.alwaysSignOff` to automatically add a Signed-off-by line to commit messages. Search for "sign-off" in VS Code settings to find it and enable it.
+
+## Inactive Pull Requests
+
+Pull requests that have been inactive for 90 days will be marked with a stale label. They will automatically be closed after a subsequent 7 days of inactivity. This timeframe may be adjusted in the future based on project needs.

README.md

@@ -16,7 +16,7 @@ The [rad CLI](https://github.com/radius-project/radius/tree/main/cmd/rad) refere
 
 ## 👨‍💻 Contributing
 
-Visit the [docs contribution guide](https://radapp.io/contributing/contributing-docs/) to learn how to contribute to the docs.
+Visit the [docs contribution guide](https://docs.radapp.io/community/contributing/docs/) to learn how to contribute to the docs.
 
 ### Local server
 
@@ -41,4 +41,4 @@ Staging docs are generated for each PR, with the URL posted as a comment. Access
 
 ## Code of Conduct
 
-Please refer to our [Radius Community Code of Conduct](https://github.com/radius-project/radius/blob/main/CODE_OF_CONDUCT.md)
+Please refer to our [Radius Community Code of Conduct](https://github.com/radius-project/radius/blob/main/CODE_OF_CONDUCT.md)

docs/content/community/_index.md

@@ -3,5 +3,5 @@ type: docs
 title: "Radius Community"
 linkTitle: "Community"
 description: "Information about the Radius community"
-weight: 90
----
+weight: 120
+---

docs/content/community/media-coverage.md → docs/content/community/media-coverage/index.md

@@ -3,7 +3,7 @@ type: docs
 title: "Radius press coverage and media links"
 linkTitle: "Press/media coverage"
 description: "Learn about Radius through press articles, blog posts, presentation and other coverage of Radius"
-weight: 400
+weight: 200
 ---
 
 ## Blog posts
@@ -13,16 +13,18 @@ weight: 400
 | [The Microsoft Azure Incubations Team launches Radius, a new open application platform for the cloud](https://azure.microsoft.com/en-us/blog/the-microsoft-azure-incubations-team-launches-radius-a-new-open-application-platform-for-the-cloud/) | Microsoft Azure Blog | Oct 18, 2023 |
 | [Enabling developer collaboration with Radius](https://cloudblogs.microsoft.com/opensource/2023/10/18/enabling-developer-collaboration-with-radius/) | Microsoft Open Source Blog | Oct 18, 2023 |
 
-Ongoing blog posts can be found at [Radius Blog](https://blog.radapp.io)
+Ongoing blog posts can be found at [Radius Blog](https://blog.radapp.io).
 
-## Videos
+## Presentations
 
 | Video | Event | Date |
 |-------|-------|------|
 | [Brendan Burns and Mark Russinovich at Ignite about Radius](https://www.youtube.com/watch?v=gaG77PiYv5w&ab_channel=MicrosoftIgnite)| Microsoft Ignite | Nov 17, 2023 |
 | [Introducing Radius - Open at Microsoft ](https://www.youtube.com/watch?v=mT_NWFnYn0A)| Open at Microsoft | Nov 7, 2023 |
 | [Mark Russinovich at the Linux Foundation Member Summit](https://aka.ms/radius-lfms)|Linux Foundation Member Summit | Oct 24, 2023 |
 
+Want to give your own presentation? Check out the [Give a Radius Presentation]({{< ref presentations >}}) page.
+
 ## Press articles
 
 | Article Title | Media Source | Date |

docs/content/community/overview.md → docs/content/community/overview/index.md

@@ -18,14 +18,12 @@ The best way to interact with the community is via the Radius Discord server:
 
 Every month we host a community meeting to showcase new features, review upcoming milestones, and engage in a Q&A. Anyone from the Radius community can participate, present a topic, or host. All are welcome! For the meeting schedule, links, and more information, visit the Radius [community repo](https://github.com/radius-project/community#community-meetings).
 
-## GitHub Issues & repositories
-
-If you would like to file Issues, access the source code, or use Codespaces please visit the [Radius GitHub repo](https://github.com/radius-project).
-
 ## How can I get involved?
 
 One of the easiest ways to contribute is to participate in discussions at community engagements or via the Discord server referenced above. We are always seeking feedback, especially for suggestions around improving the product and docs.
 
+If you are interested in contributing to the Radius project, please visit the [Contributing to Radius]({{< ref contributing >}}) page for more information.
+
 ## Press and media coverage
 
 Visit the [press and media coverage docs]({{< ref media-coverage >}}) for a list of press articles, blog posts, presentations, and other coverage of Radius.

docs/content/concepts/faq/index.md

@@ -188,8 +188,8 @@ Where .NET Aspire is focused on the .NET experience from moving from local devel
 
 ### How does Radius compare to Azure Developer CLI (azd)?
 
-The [Azure Developer CLI](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/) is an open-source tool that provides developer-friendly commands to simplify the process of building, deploying, and managing Azure resources. While both azd and Radius are geared towards the development and deployment workflows, the most apparent difference is that azd can be only be used to manage Azure resources, whereas Radius supports multiple cloud providers. Radius also introduces a way to model (and not just deploy) entire applications and automate these through [Recipes]({{< ref "guides/recipes/overview">}}), which allows for complete [separation of concerns]({{< ref "collaboration-concept" >}}) between operators and developers. With azd, even though developers may leverage CLI templates to deploy infrastructure, they still need to understand the underlying infrastructure and how to connect to it.
+The [Azure Developer CLI](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/) is an open-source tool that provides developer-friendly commands to simplify the process of building, deploying, and managing Azure resources. While both azd and Radius are geared towards the development and deployment workflows, the most apparent difference is that azd can be only be used to manage Azure resources, whereas Radius supports multiple cloud providers. Radius also introduces a way to model (and not just deploy) entire applications and automate these through [Recipes]({{< ref "guides/recipes/overview">}}), which allows for complete [separation of concerns]({{< ref "collaboration" >}}) between operators and developers. With azd, even though developers may leverage CLI templates to deploy infrastructure, they still need to understand the underlying infrastructure and how to connect to it.
 
 ### How does Radius compare to KubeVela?
 
-[KubeVela](https://kubevela.io/) is an open-source platform that provides a higher level of abstraction for application deployments. Similar to Radius, it allows developers to define applications and their components, deployment across cloud providers or on-prem, and automated infrastructure provisioning with pre-defined templates. However, unlike Radius, KubeVela does not allow for modeling of connections between resources to set environment variables, configure access credentials, and more that make it simpler for developers to deploy and access resources.
+[KubeVela](https://kubevela.io/) is an open-source platform that provides a higher level of abstraction for application deployments. Similar to Radius, it allows developers to define applications and their components, deployment across cloud providers or on-prem, and automated infrastructure provisioning with pre-defined templates. However, unlike Radius, KubeVela does not allow for modeling of connections between resources to set environment variables, configure access credentials, and more that make it simpler for developers to deploy and access resources.