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

Update Ingress gateway walkthrough to use Appmesh prod #322

Merged
merged 2 commits into from
Jul 13, 2020
Merged

Update Ingress gateway walkthrough to use Appmesh prod #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e5d819
Update Ingress gateway walkthrough to use appmesh prod cli
rajal-amzn Jul 10, 2020
08e2500
Setting Healthcheck StartPeriod as 60s
rajal-amzn Jul 13, 2020
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
9 changes: 1 addition & 8 deletions walkthroughs/howto-ingress-gateway/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,7 @@ Internet --> (terminate TLS) NLB (originate TLS) --> (terminate TLS) Gateway (or

## Step 1: Prerequisites

You will need the latest version of the App Mesh Preview CLI for this walkthrough. You can download and use the latest version using the command below.

```bash
aws configure add-model \
--service-name appmesh-preview \
--service-model https://raw.githubusercontent.com/aws/aws-app-mesh-roadmap/master/appmesh-preview/service-model.json
```
You'll also need a keypair stored in AWS to access a bastion host. You can create a keypair using the command below if you don't have one. See [Amazon EC2 Key Pairs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html).
You'll need a keypair stored in AWS to access a bastion host. You can create a keypair using the command below if you don't have one. See [Amazon EC2 Key Pairs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html).

```bash
aws ec2 create-key-pair --key-name color-app | jq -r .KeyMaterial > ~/.ssh/color-app.pem
Expand Down
11 changes: 1 addition & 10 deletions walkthroughs/howto-ingress-gateway/infrastructure/ecs-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ Resources:
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
Value: !Sub 'mesh/${AppMeshMeshName}/virtualNode/colorteller-white-vn'
- Name: 'APPMESH_PREVIEW'
Value: '1'

ColorTellerWhiteService:
Type: 'AWS::ECS::Service'
Expand Down Expand Up @@ -249,8 +247,6 @@ Resources:
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
Value: !Sub 'mesh/${AppMeshMeshName}/virtualNode/colorteller-black-vn'
- Name: 'APPMESH_PREVIEW'
Value: '1'

ColorTellerBlackService:
Type: 'AWS::ECS::Service'
Expand Down Expand Up @@ -370,8 +366,6 @@ Resources:
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
Value: !Sub 'mesh/${AppMeshMeshName}/virtualNode/colorteller-blue-vn'
- Name: 'APPMESH_PREVIEW'
Value: '1'

ColorTellerBlueService:
Type: 'AWS::ECS::Service'
Expand Down Expand Up @@ -491,8 +485,6 @@ Resources:
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
Value: !Sub 'mesh/${AppMeshMeshName}/virtualNode/colorteller-red-vn'
- Name: 'APPMESH_PREVIEW'
Value: '1'

ColorTellerRedService:
Type: 'AWS::ECS::Service'
Expand Down Expand Up @@ -564,6 +556,7 @@ Resources:
Interval: 5
Timeout: 2
Retries: 3
StartPeriod: 60
LogConfiguration:
LogDriver: 'awslogs'
Options:
Expand All @@ -574,8 +567,6 @@ Resources:
Environment:
- Name: 'APPMESH_VIRTUAL_NODE_NAME'
Value: !Sub 'mesh/${AppMeshMeshName}/virtualGateway/colorgateway-vg'
- Name: 'APPMESH_PREVIEW'
Value: '1'
- Name: 'ENABLE_ENVOY_STATS_TAGS'
Value: '1'
- Name: 'ENABLE_ENVOY_DOG_STATSD'
Expand Down
4 changes: 2 additions & 2 deletions walkthroughs/howto-ingress-gateway/mesh/mesh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sanity_check() {
fi
}

appmesh_cmd="aws appmesh-preview"
appmesh_cmd="aws appmesh"

create_mesh() {
spec_file=$1
Expand Down Expand Up @@ -302,4 +302,4 @@ main() {
esac
}

main $@
main $@