Skip to content

Commit

Permalink
update bicep values.yaml and README
Browse files Browse the repository at this point in the history
  • Loading branch information
nithyatsu committed Oct 27, 2023
1 parent fb77e21 commit 84796d2
Show file tree
Hide file tree
Showing 26 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions samples/aws-sqs/sqs.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource producer 'Applications.Core/containers@2023-10-01-preview' = {
},
aws_credential
)
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/aws-sqs-sample:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/aws-sqs-sample:latest'
}
}
}
Expand All @@ -61,7 +61,7 @@ resource consumer 'Applications.Core/containers@2023-10-01-preview' = {
},
aws_credential
)
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/aws-sqs-sample:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/aws-sqs-sample:latest'
}
}
}
2 changes: 1 addition & 1 deletion samples/aws/awss3.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
AWS_SECRET_ACCESS_KEY: aws_secret_access_key
AWS_DEFAULT_REGION: aws_region
}
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/aws:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/aws:latest'
}
}
}
4 changes: 2 additions & 2 deletions samples/dapr/dapr-azure.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource backend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/dapr-backend:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/dapr-backend:latest'
ports: {
web: {
containerPort: 3000
Expand All @@ -42,7 +42,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/dapr-frontend:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/dapr-frontend:latest'
env: {
CONNECTION_BACKEND_APPID: backend.name
}
Expand Down
4 changes: 2 additions & 2 deletions samples/dapr/dapr.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resource backend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/dapr-backend:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/dapr-backend:latest'
ports: {
web: {
containerPort: 3000
Expand All @@ -45,7 +45,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/dapr-frontend:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/dapr-frontend:latest'
env: {
CONNECTION_BACKEND_APPID: backend.name
}
Expand Down
2 changes: 1 addition & 1 deletion samples/demo/Chart/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
image:
repository: k3d-mycluster-registry.localhost:5000/radius-project/samples/demo
repository: k3d-myregistry.localhost:5050/radius-project/samples/demo
tag: latest
2 changes: 1 addition & 1 deletion samples/demo/app.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/demo:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/basket-api.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource basketApi 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/basket.api:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/basket.api:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/blazor-client.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ resource blazorClient 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/blazor.client:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/blazor.client:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/catalog-api.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ resource catalogApi 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/catalog.api:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/catalog.api:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/identity-api.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource identityApi 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/identity.api:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/identity.api:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/ordering-api.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ resource orderingApi 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/ordering.api:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/ordering.api:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/payment-api.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resource paymentApi 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/payment.api:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/payment.api:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/webshopping-agg.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ resource webshoppingAgg 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/webshoppingagg:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/webshoppingagg:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/webshopping-gw.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resource webshoppingGw 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/webshoppingapigw:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/webshoppingapigw:rad-latest'
env: {
ENVOY_CATALOG_API_ADDRESS: catalogApiRoute.properties.hostname
ENVOY_CATALOG_API_PORT: '${catalogApiRoute.properties.port}'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop-dapr/services/webstatus.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: appId
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshopdapr/webstatus:rad-latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshopdapr/webstatus:rad-latest'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
4 changes: 2 additions & 2 deletions samples/eshop/envoy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ What this means is that if we need to update the names of routes in eshop, *we l

The routing configuration is in [envoy.yaml](envoy.yaml). See the `route_config` section specifically.

To build the docker image, run `docker build . -t k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop-envoy:0.1.<NUMBER>`.
To build the docker image, run `docker build . -t k3d-myregistry.localhost:5050/radius-project/samples/eshop-envoy:0.1.<NUMBER>`.

Where NUMBER is one greater than the latest version made. To view versions, see https://ms.portal.azure.com/#view/Microsoft_Azure_ContainerRegistries/RepositoryBlade/id/%2Fsubscriptions%2F66d1209e-1382-45d3-99bb-650e6bf63fc0%2FresourceGroups%2Fassets%2Fproviders%2FMicrosoft.ContainerRegistry%2Fregistries%2Fradius/repository/eshop-envoy.

To push the image, run `az acr login -n radius` and then `docker push k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop-envoy:0.1.<NUMBER>`.
To push the image, run `az acr login -n radius` and then `docker push k3d-myregistry.localhost:5050/radius-project/samples/eshop-envoy:0.1.<NUMBER>`.

2 changes: 1 addition & 1 deletion samples/eshop/iac/services/basket.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ resource basket 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/basket.api:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/basket.api:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop/iac/services/catalog.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource catalog 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/catalog.api:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/catalog.api:${TAG}'
env: {
UseCustomizationData: 'False'
PATH_BASE: '/catalog-api'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop/iac/services/identity.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ resource identity 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/identity.api:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/identity.api:${TAG}'
env: {
PATH_BASE: '/identity-api'
ASPNETCORE_ENVIRONMENT: 'Development'
Expand Down
6 changes: 3 additions & 3 deletions samples/eshop/iac/services/ordering.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ resource ordering 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/ordering.api:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/ordering.api:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down Expand Up @@ -119,7 +119,7 @@ resource orderbgtasks 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/ordering.backgroundtasks:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/ordering.backgroundtasks:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down Expand Up @@ -156,7 +156,7 @@ resource orderingsignalrhub 'Applications.Core/containers@2023-10-01-preview' =
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/ordering.signalrhub:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/ordering.signalrhub:${TAG}'
env: {
PATH_BASE: '/payment-api'
ASPNETCORE_ENVIRONMENT: 'Development'
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop/iac/services/payment.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ resource payment 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/payment.api:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/payment.api:${TAG}'
env: {
ApplicationInsights__InstrumentationKey: APPLICATION_INSIGHTS_KEY
'Serilog__MinimumLevel__Override__payment-api.IntegrationEvents.EventHandling': 'Verbose'
Expand Down
4 changes: 2 additions & 2 deletions samples/eshop/iac/services/web.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ resource webspa 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/webspa:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/webspa:${TAG}'
env: {
PATH_BASE: '/'
ASPNETCORE_ENVIRONMENT: 'Production'
Expand Down Expand Up @@ -103,7 +103,7 @@ resource webmvc 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/webmvc:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/webmvc:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
4 changes: 2 additions & 2 deletions samples/eshop/iac/services/webhooks.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ resource webhooks 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/webhooks.api:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/webhooks.api:${TAG}'
env: {
PATH_BASE: '/webhooks-api'
ASPNETCORE_ENVIRONMENT: 'Development'
Expand Down Expand Up @@ -90,7 +90,7 @@ resource webhooksclient 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/webhooks.client:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/webhooks.client:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Production'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
4 changes: 2 additions & 2 deletions samples/eshop/iac/services/webshopping.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ resource webshoppingagg 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/webshoppingagg:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/webshoppingagg:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
PATH_BASE: '/webshoppingagg'
Expand Down Expand Up @@ -119,7 +119,7 @@ resource webshoppingapigw 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/envoy:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/envoy:latest'
ports: {
http: {
containerPort: 80
Expand Down
2 changes: 1 addition & 1 deletion samples/eshop/iac/services/webstatus.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/eshop/webstatus:${TAG}'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/eshop/webstatus:${TAG}'
env: {
ASPNETCORE_ENVIRONMENT: 'Development'
ASPNETCORE_URLS: 'http://0.0.0.0:80'
Expand Down
2 changes: 1 addition & 1 deletion samples/volumes/app.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'k3d-mycluster-registry.localhost:5000/radius-project/samples/volumes:latest'
image: 'k3d-myregistry.localhost:5050/radius-project/samples/volumes:latest'
volumes: {
temp: {
kind: 'ephemeral'
Expand Down

0 comments on commit 84796d2

Please sign in to comment.