Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Replace APPMESH_VIRTUAL_NODE_NAME with APPMESH_RESOURCE_ARN #566

Merged
merged 1 commit into from
Apr 20, 2023
Merged

Replace APPMESH_VIRTUAL_NODE_NAME with APPMESH_RESOURCE_ARN #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions blogs/ecs-cross-account/account_backend/redis_and_database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: "database-envoy"
Environment:
- Name: "APPMESH_VIRTUAL_NODE_NAME"
- Name: "APPMESH_RESOURCE_ARN"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this new env variable doesn't actually need the full arn?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's true.

Value: !Sub "mesh/${MeshName}/virtualNode/yelb-db-vn"
- Name: "ENVOY_LOG_LEVEL"
Value: "debug"
Expand Down Expand Up @@ -311,7 +311,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: "redis-envoy"
Environment:
- Name: "APPMESH_VIRTUAL_NODE_NAME"
- Name: "APPMESH_RESOURCE_ARN"
Value: !Sub "mesh/${MeshName}/virtualNode/redis-server-vn"
- Name: "ENVOY_LOG_LEVEL"
Value: "debug"
Expand Down
4 changes: 2 additions & 2 deletions blogs/ecs-cross-account/account_frontend/app_and_frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: "appserver-envoy"
Environment:
- Name: "APPMESH_VIRTUAL_NODE_NAME"
- Name: "APPMESH_RESOURCE_ARN"
Value: !Sub "mesh/${MeshName}@${MeshOwner}/virtualNode/yelb-appserver-vn"
- Name: "ENVOY_LOG_LEVEL"
Value: "debug"
Expand Down Expand Up @@ -394,7 +394,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: "ui-envoy"
Environment:
- Name: "APPMESH_VIRTUAL_NODE_NAME"
- Name: "APPMESH_RESOURCE_ARN"
Value: !Sub "mesh/${MeshName}@${MeshOwner}/virtualNode/yelb-ui-vn"
- Name: "ENVOY_LOG_LEVEL"
Value: "debug"
Expand Down
2 changes: 1 addition & 1 deletion blogs/ecs-ec2-crossvpc-with-tls/appmesh-baseline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Resources:
Essential: true
User: 1337
Environment:
- Name: "APPMESH_VIRTUAL_NODE_NAME"
- Name: "APPMESH_RESOURCE_ARN"
Value: "mesh/appmesh-workshop/virtualNode/crystal-lb-vanilla"
HealthCheck:
Command:
Expand Down
2 changes: 1 addition & 1 deletion blogs/ecs-ec2-crossvpc-with-tls/appmesh-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Resources:
Essential: true
User: 1337
Environment:
- Name: "APPMESH_VIRTUAL_NODE_NAME"
- Name: "APPMESH_RESOURCE_ARN"
Value: "mesh/appmesh-workshop/virtualNode/nodejs-lb-strawberry"
HealthCheck:
Command:
Expand Down
2 changes: 1 addition & 1 deletion blogs/ecs-ec2-crossvpc-with-tls/frontend-envoy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mainSteps:
$(aws ecr get-login --no-include-email --region {{region}} --registry-ids 840364872350)
# Install and run envoy
sudo docker run --detach \
--env APPMESH_VIRTUAL_NODE_NAME=mesh/{{meshName}}/virtualNode/{{vNodeName}} \
--env APPMESH_RESOURCE_ARN=mesh/{{meshName}}/virtualNode/{{vNodeName}} \
--env ENABLE_ENVOY_XRAY_TRACING=1 \
--log-driver=awslogs \
--log-opt awslogs-region={{region}} \
Expand Down
6 changes: 3 additions & 3 deletions ...lb/deployments/platformdeployment/AWS/ECS/yelb-cloudformation-ECS-AppMesh-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Resources:
Value: '1'
- Name: ENABLE_ENVOY_DOG_STATSD
Value: '1'
- Name: APPMESH_VIRTUAL_NODE_NAME
- Name: APPMESH_RESOURCE_ARN
Value:
Fn::Join:
- ''
Expand Down Expand Up @@ -274,7 +274,7 @@ Resources:
Value: '1'
- Name: STATSD_PORT
Value: '8125'
- Name: APPMESH_VIRTUAL_NODE_NAME
- Name: APPMESH_RESOURCE_ARN
Value:
Fn::Join:
- ''
Expand Down Expand Up @@ -419,7 +419,7 @@ Resources:
Value: '1'
- Name: ENABLE_ENVOY_DOG_STATSD
Value: '1'
- Name: APPMESH_VIRTUAL_NODE_NAME
- Name: APPMESH_RESOURCE_ARN
Value:
Fn::Join:
- ''
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/colorapp/ecs/envoy-container.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
"environment": [
{
"name": "APPMESH_VIRTUAL_NODE_NAME",
"name": "APPMESH_RESOURCE_ARN",
"value": $VIRTUAL_NODE
},
{
Expand Down
10 changes: 5 additions & 5 deletions examples/apps/colorapp/kubernetes/generate-templates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
securityContext:
runAsUser: 1337
env:
- name: "APPMESH_VIRTUAL_NODE_NAME"
- name: "APPMESH_RESOURCE_ARN"
value: "mesh/${MESH_NAME}/virtualNode/colorgateway-vn"
- name: "ENVOY_LOG_LEVEL"
value: "debug"
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
securityContext:
runAsUser: 1337
env:
- name: "APPMESH_VIRTUAL_NODE_NAME"
- name: "APPMESH_RESOURCE_ARN"
value: "mesh/${MESH_NAME}/virtualNode/colorteller-white-vn"
- name: "ENVOY_LOG_LEVEL"
value: "debug"
Expand Down Expand Up @@ -202,7 +202,7 @@ spec:
securityContext:
runAsUser: 1337
env:
- name: "APPMESH_VIRTUAL_NODE_NAME"
- name: "APPMESH_RESOURCE_ARN"
value: "mesh/${MESH_NAME}/virtualNode/colorteller-black-vn"
- name: "ENVOY_LOG_LEVEL"
value: "debug"
Expand Down Expand Up @@ -277,7 +277,7 @@ spec:
securityContext:
runAsUser: 1337
env:
- name: "APPMESH_VIRTUAL_NODE_NAME"
- name: "APPMESH_RESOURCE_ARN"
value: "mesh/${MESH_NAME}/virtualNode/colorteller-blue-vn"
- name: "ENVOY_LOG_LEVEL"
value: "debug"
Expand Down Expand Up @@ -352,7 +352,7 @@ spec:
securityContext:
runAsUser: 1337
env:
- name: "APPMESH_VIRTUAL_NODE_NAME"
- name: "APPMESH_RESOURCE_ARN"
value: "mesh/${MESH_NAME}/virtualNode/colorteller-red-vn"
- name: "ENVOY_LOG_LEVEL"
value: "debug"
Expand Down
2 changes: 1 addition & 1 deletion walkthroughs/fargate/envoy-container.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
"environment": [
{
"name": "APPMESH_VIRTUAL_NODE_NAME",
"name": "APPMESH_RESOURCE_ARN",
"value": $VIRTUAL_NODE
},
{
Expand Down
4 changes: 2 additions & 2 deletions walkthroughs/howto-alb/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_STATS_TAGS'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down Expand Up @@ -694,7 +694,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_STATS_TAGS'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down
2 changes: 1 addition & 1 deletion walkthroughs/howto-cross-account/primary-account/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'backend-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}-mesh/virtualNode/backend-1-vn'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down
2 changes: 1 addition & 1 deletion walkthroughs/howto-cross-account/secondary-account/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'backend-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}-mesh@${MeshOwner}/virtualNode/backend-2-vn'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down
4 changes: 2 additions & 2 deletions walkthroughs/howto-ecs-basics/deploy/2-meshify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_DOG_STATSD'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down Expand Up @@ -677,7 +677,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_DOG_STATSD'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down
6 changes: 3 additions & 3 deletions walkthroughs/howto-ecs-basics/deploy/3-routing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_DOG_STATSD'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down Expand Up @@ -618,7 +618,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_DOG_STATSD'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down Expand Up @@ -880,7 +880,7 @@ Resources:
Value: '1'
- Name: 'ENABLE_ENVOY_DOG_STATSD'
Value: '1'
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value:
Fn::Join:
- ''
Expand Down
2 changes: 1 addition & 1 deletion walkthroughs/howto-external-traffic/infrastructure/ecs-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'white-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${AppMeshMeshName}/virtualNode/ColorTellerWhite'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down
4 changes: 2 additions & 2 deletions walkthroughs/howto-grpc-ingress-gateway/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'color_gateway-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}-mesh/virtualGateway/color_gateway'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down Expand Up @@ -311,7 +311,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'color_server-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}-mesh/virtualNode/color_server'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down
4 changes: 2 additions & 2 deletions walkthroughs/howto-grpc/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'color_client-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}-mesh/virtualNode/color_client'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down Expand Up @@ -340,7 +340,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'color_server-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}-mesh/virtualNode/color_server'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down
16 changes: 8 additions & 8 deletions walkthroughs/howto-http-headers/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'feapp-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/front-node'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down Expand Up @@ -730,7 +730,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'blue-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/blue-node'

GreenTaskDef:
Expand Down Expand Up @@ -806,7 +806,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'green-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/green-node'

RedTaskDef:
Expand Down Expand Up @@ -882,7 +882,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'red-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/red-node'

YellowTaskDef:
Expand Down Expand Up @@ -958,7 +958,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'yellow-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/yellow-node'

PurpleTaskDef:
Expand Down Expand Up @@ -1034,7 +1034,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'purple-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/purple-node'

WhiteTaskDef:
Expand Down Expand Up @@ -1110,7 +1110,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'white-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/white-node'

BlackTaskDef:
Expand Down Expand Up @@ -1186,7 +1186,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'black-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/black-node'

FrontService:
Expand Down
4 changes: 2 additions & 2 deletions walkthroughs/howto-http-retries/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'feapp-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/front-node'
- Name: 'ENVOY_LOG_LEVEL'
Value: 'debug'
Expand Down Expand Up @@ -433,7 +433,7 @@ Resources:
awslogs-region: !Ref AWS::Region
awslogs-stream-prefix: 'blue-envoy'
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
- Name: 'APPMESH_RESOURCE_ARN'
Value: !Sub 'mesh/${ProjectName}/virtualNode/blue-node'

FrontService:
Expand Down
Loading