Skip to content

Commit

Permalink
Merge branch 'v0.26' into rynowak/kubernetes-interop-tutorial
Browse files Browse the repository at this point in the history
  • Loading branch information
Reshrahim authored Oct 24, 2023
2 parents 47f8af1 + 1b1ee51 commit 1d774ca
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"ms-python.python",
"dunn.redis",
"GitHub.copilot",
"/tmp/rad-vscode-bicep.vsix"
"ms-azuretools.rad-vscode-bicep"
]
}
},
Expand Down
7 changes: 2 additions & 5 deletions .devcontainer/on-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ else
fi

if [ "$RADIUS_VERSION" = "edge" ]; then
wget -q "https://get.radapp.dev/tools/rad/install.sh" -O - | /bin/bash -s edge
wget -q "https://raw.githubusercontent.com/radius-project/radius/main/deploy/install.sh" -O - | /bin/bash -s edge
else
wget -q "https://get.radapp.dev/tools/rad/install.sh" -O - | /bin/bash
wget -q "https://raw.githubusercontent.com/radius-project/radius/main/deploy/install.sh" -O - | /bin/bash
fi

## Download Bicep extension
curl https://get.radapp.dev/tools/vscode-extensibility/$RADIUS_VERSION/rad-vscode-bicep.vsix --output /tmp/rad-vscode-bicep.vsix
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
schedule: # 7:45 AM Pacific Time
- cron: "45 15 * * *"
env:
RAD_CLI_URL: https://get.radapp.dev/tools/rad/install.sh
RAD_CLI_URL: https://raw.githubusercontent.com/radius-project/radius/main/deploy/install.sh
RUN_IDENTIFIER: samplestest-${{ github.run_id }}-${{ github.run_attempt }}
jobs:
test:
Expand Down Expand Up @@ -191,8 +191,8 @@ jobs:
echo "Downloading rad CLI version ${{ inputs.version }}"
wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash -s ${{ inputs.version }}
else
echo "Downloading edge rad CLI"
wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash -s edge
echo "Downloading latest rad CLI"
wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash
fi
if [ $? -eq 0 ]; then
Expand Down
8 changes: 4 additions & 4 deletions samples/eshop/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# eShop on Radius reference application

Visit the [Project Radius docs](https://radapp.dev/getting-started/reference-apps/eshop/) to learn more and try it out.
Visit the [Project Radius docs](https://docs.radapp.io/tutorials/eshop/) to learn more and try it out.

## Source

This reference app is a "radified" version of the [eShop on containers](https://github.com/dotnet-architecture/eShopOnContainers) .NET reference application.

## Deploy

1. Have a kubernetes cluster handy from the [supported clusters](https://docs.radapp.dev/operations/platforms/kubernetes/supported-clusters/).
1. Have a kubernetes cluster handy from the [supported clusters](https://docs.radapp.io/guides/operations/kubernetes/overview/#supported-kubernetes-clusters).
- (AWS only) Make sure that each of the Subnets in your EKS cluster Subnet Group are within the list of [supported MemoryDB availability zones](https://docs.aws.amazon.com/memorydb/latest/devguide/subnetgroups.html)
1. [Install the rad CLI](https://radapp.dev/getting-started/)
1. [Initialize a new Radius environment](https://radapp.dev/getting-started/)
1. [Install the rad CLI](https://docs.radapp.io/getting-started/)
1. [Initialize a new Radius environment](https://docs.radapp.io/getting-started/)
1. Clone the repository and switch to the app directory:
```bash
git clone https://github.com/radius-project/samples.git
Expand Down

0 comments on commit 1d774ca

Please sign in to comment.