-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update eShop to use Recipes #590
Merged
Merged
Changes from 12 commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
694afa1
Replace eShop with eShop on recipes
willdavsmith ce9af56
PR
willdavsmith cb8f912
Fix
willdavsmith a46c7a1
Test
willdavsmith 9d3ddf8
PR
willdavsmith 685ba81
Merge branch 'edge' into willdavsmith/3-eshop-recipes
willdavsmith 2627f2b
oops
willdavsmith 595d512
Merge remote-tracking branch 'origin/willdavsmith/3-eshop-recipes' in…
willdavsmith e3905b5
Updates
willdavsmith 2abeac2
PR
willdavsmith 127c20d
PR
willdavsmith 8707935
PR
willdavsmith e39b8d6
PR comments
willdavsmith 6443a8d
PR comments
willdavsmith a97dc9a
fixing
willdavsmith dedd399
again
willdavsmith aff0800
fix
willdavsmith e5ec418
rewind
willdavsmith b07866c
PR
willdavsmith 8b00637
PR
willdavsmith f48a0ad
Merge branch 'edge' into willdavsmith/3-eshop-recipes
AaronCrawfis 69dfcc1
Simplify env registration
AaronCrawfis dba4ebb
Make registry a parameter
AaronCrawfis 8f7d4a0
Update test
AaronCrawfis 08e1ce1
Update namespaces
AaronCrawfis 67121b8
Merge branch 'edge' into willdavsmith/3-eshop-recipes
AaronCrawfis 05b3e11
Merge branch 'edge' into willdavsmith/3-eshop-recipes
AaronCrawfis c8480ae
Fix tag
AaronCrawfis 10dccb6
Update env names
AaronCrawfis dbdadf5
Fix namespaces
AaronCrawfis e1af6b2
Fix recipe
AaronCrawfis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import radius as rad | ||
|
|
||
| @description('Account ID of the AWS account resources should be deployed in') | ||
| param awsAccountId string | ||
|
|
||
| @description('AWS region that resources should be deployed in') | ||
| param awsRegion string | ||
|
|
||
| @description('Name of your EKS cluster') | ||
| param eksClusterName string | ||
|
|
||
| resource awsEshopEnv 'Applications.Core/environments@2023-10-01-preview' = { | ||
| name: 'aws-eshop' | ||
| properties: { | ||
| compute: { | ||
| kind: 'kubernetes' | ||
| resourceId: 'self' | ||
| namespace: 'aws-eshop' | ||
| } | ||
| providers: { | ||
| aws: { | ||
| scope: '/planes/aws/aws/accounts/${awsAccountId}/regions/${awsRegion}' | ||
| } | ||
| } | ||
| recipes: { | ||
| 'Applications.Datastores/sqlDatabases': { | ||
| sqldatabase: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/aws/sqldatabases:edge' | ||
| parameters: { | ||
| eksClusterName: eksClusterName | ||
| } | ||
| } | ||
| } | ||
| 'Applications.Datastores/redisCaches': { | ||
| rediscache: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/aws/rediscaches:edge' | ||
| parameters: { | ||
| eksClusterName: eksClusterName | ||
| } | ||
| } | ||
| } | ||
| // Use containerized RabbitMQ instead of Amazon SQS | ||
| // https://github.com/radius-project/bicep-types-aws/blob/main/docs/reference/limitations.md | ||
| 'Applications.Messaging/rabbitMQQueues': { | ||
| rabbitmqmessagequeue: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/local-dev/rabbitmqmessagequeues:edge' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import radius as rad | ||
|
|
||
| @description('Azure ResourceGroup name') | ||
| param azureResourceGroup string = resourceGroup().name | ||
|
|
||
| @description('Azure SubscriptionId') | ||
| param azureSubscription string = subscription().subscriptionId | ||
AaronCrawfis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| resource azureEShopEnv 'Applications.Core/environments@2023-10-01-preview' = { | ||
| name: 'azure-eshop' | ||
| properties: { | ||
| compute: { | ||
| kind: 'kubernetes' | ||
| resourceId: 'self' | ||
| namespace: 'azure-eshop' | ||
| } | ||
| providers: { | ||
| azure: { | ||
| scope: '/subscriptions/${azureSubscription}/resourceGroups/${azureResourceGroup}' | ||
| } | ||
| } | ||
| recipes: { | ||
| 'Applications.Datastores/sqlDatabases': { | ||
| sqldatabase: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/azure/sqldatabases:latest' | ||
| } | ||
| } | ||
| 'Applications.Datastores/redisCaches': { | ||
| rediscache: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/azure/rediscaches:latest' | ||
| } | ||
| } | ||
| 'Applications.Core/extenders': { | ||
| servicebus: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/azure/extender-servicebus:latest' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import radius as rad | ||
|
|
||
| resource containersEShopEnv 'Applications.Core/environments@2023-10-01-preview' = { | ||
| name: 'containers-eshop' | ||
| properties: { | ||
| compute: { | ||
| kind: 'kubernetes' | ||
| resourceId: 'self' | ||
| namespace: 'containers-eshop' | ||
| } | ||
| recipes: { | ||
| 'Applications.Datastores/sqlDatabases': { | ||
| sqldatabase: { | ||
AaronCrawfis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/local-dev/sqldatabases:edge' | ||
| } | ||
| } | ||
| 'Applications.Datastores/redisCaches': { | ||
| rediscache: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/local-dev/rediscaches:edge' | ||
| } | ||
| } | ||
| 'Applications.Messaging/rabbitMQQueues': { | ||
| rabbitmqmessagequeue: { | ||
| templateKind: 'bicep' | ||
| templatePath: 'radius.azurecr.io/recipes/local-dev/rabbitmqmessagequeues:edge' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a TODO?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not directly. This is more of a comment of why we're using the local-dev Recipe instead of the Azure service, which is non-idempotent and not supported by Radius. Once we add non-idempotent service support we could come back and update this later.