From 3ea7c5d10e3080fbeaff1bbd5d883610f31c2ff4 Mon Sep 17 00:00:00 2001 From: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com> Date: Tue, 17 Oct 2023 20:26:59 -0400 Subject: [PATCH 1/5] Update get.radapp.dev references (#625) * Update get.radapp.dev refernces * Update vscode extension install --- .devcontainer/devcontainer.json | 2 +- .devcontainer/on-create.sh | 7 ++----- .github/workflows/test.yaml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cd43a462..fe248053 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -27,7 +27,7 @@ "ms-python.python", "dunn.redis", "GitHub.copilot", - "/tmp/rad-vscode-bicep.vsix" + "ms-azuretools.rad-vscode-bicep" ] } }, diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh index 14a38636..ed604f31 100644 --- a/.devcontainer/on-create.sh +++ b/.devcontainer/on-create.sh @@ -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 \ No newline at end of file diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ac84ef97..8b3853d5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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: From 71d69bcb0c22854e7ad1664d90d482fa9b2b91fd Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Thu, 19 Oct 2023 13:23:12 -0700 Subject: [PATCH 2/5] Update eShop Readme with new url links (#647) --- samples/eshop/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/eshop/README.md b/samples/eshop/README.md index f858478c..a8869007 100644 --- a/samples/eshop/README.md +++ b/samples/eshop/README.md @@ -1,6 +1,6 @@ # 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 @@ -8,10 +8,10 @@ This reference app is a "radified" version of the [eShop on containers](https:// ## 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 From 1b1ee51c809f6415ed656c72cf15080ef53dfbf0 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Mon, 23 Oct 2023 15:36:38 -0700 Subject: [PATCH 3/5] Fix edge version download (#685) --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8b3853d5..1905fde2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 From 5b4f46272937a70bc68cafa339f8e1ce04b29f08 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Tue, 24 Oct 2023 10:11:24 -0700 Subject: [PATCH 4/5] Add Kuberenetes tutorial content (#620) * Add Kuberenetes tutorial content * Update demo/Chart/values.yaml Co-authored-by: Aaron Crawfis * Update demo/Chart/values.yaml Co-authored-by: Aaron Crawfis * k8s guestbook application example for use in tutorial (#626) * copy over k8s guestbook application example for use in tutorial Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Jonathan Smith --------- Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> Co-authored-by: Jonathan Smith * Rebase to v0.26 * move chat templatesto samples --------- Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> Co-authored-by: Aaron Crawfis Co-authored-by: Will <28876888+willtsai@users.noreply.github.com> Co-authored-by: Jonathan Smith Co-authored-by: Reshma Abdul Rahim Co-authored-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com> --- .gitattributes | 3 ++- samples/README.md | 2 +- samples/demo/Chart/Chart.yaml | 5 +++++ samples/demo/Chart/templates/app.yaml | 25 +++++++++++++++++++++++++ samples/demo/Chart/values.yaml | 3 +++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 samples/demo/Chart/Chart.yaml create mode 100644 samples/demo/Chart/templates/app.yaml create mode 100644 samples/demo/Chart/values.yaml diff --git a/.gitattributes b/.gitattributes index b0de1df1..dc9cbb5d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ # text files use OS defaults on checkout, LF on checkin * text eol=auto # images are binary -*.png binary \ No newline at end of file +*.png binary +*.ico binary \ No newline at end of file diff --git a/samples/README.md b/samples/README.md index fb0fa912..bca12942 100644 --- a/samples/README.md +++ b/samples/README.md @@ -1,4 +1,4 @@ -# Reference applicatins +# Reference applications Reference apps are templates that show a complete app. You are able to clone and deploy any of these apps to try out various Project Radius functionality. diff --git a/samples/demo/Chart/Chart.yaml b/samples/demo/Chart/Chart.yaml new file mode 100644 index 00000000..19a18b9d --- /dev/null +++ b/samples/demo/Chart/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "0.1.0" +version: 0.1.0 +name: demo +description: A Helm chart for the Radius demo application. \ No newline at end of file diff --git a/samples/demo/Chart/templates/app.yaml b/samples/demo/Chart/templates/app.yaml new file mode 100644 index 00000000..c9c62e11 --- /dev/null +++ b/samples/demo/Chart/templates/app.yaml @@ -0,0 +1,25 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: webapp + namespace: {{ .Release.Namespace }} +spec: + selector: + matchLabels: + app: webapp + template: + metadata: + labels: + app: webapp + spec: + containers: + - name: webapp + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + env: + - name: CONNECTION_REDIS_URL + valueFrom: + secretKeyRef: + name: redis-secret + key: url + ports: + - containerPort: 3000 \ No newline at end of file diff --git a/samples/demo/Chart/values.yaml b/samples/demo/Chart/values.yaml new file mode 100644 index 00000000..9751b981 --- /dev/null +++ b/samples/demo/Chart/values.yaml @@ -0,0 +1,3 @@ +image: + repository: ghcr.io/radius-project/samples/demo + tag: latest \ No newline at end of file From 82cb31ca27c46e1b34088c3aa44b0a4c1faab06b Mon Sep 17 00:00:00 2001 From: Reshma Abdul Rahim Date: Tue, 24 Oct 2023 16:24:36 -0400 Subject: [PATCH 5/5] Revert changes to test.yaml --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1905fde2..8b3853d5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 latest rad CLI" - wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash + echo "Downloading edge rad CLI" + wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash -s edge fi if [ $? -eq 0 ]; then