Skip to content

Instantly share code, notes, and snippets.

@mizzy
Last active October 1, 2021 12:58
Show Gist options
  • Save mizzy/37401088bc6e3564addf7a27d698f6fb to your computer and use it in GitHub Desktop.
Save mizzy/37401088bc6e3564addf7a27d698f6fb to your computer and use it in GitHub Desktop.
--- ../../../markfink-splunk/sock-shop/ecs-fargate/cfn-stack-app-only.yaml 2021-09-17 19:50:03.000000000 +0900
+++ ./cfn-stack-app-only.yaml 2021-10-01 21:57:26.000000000 +0900
@@ -35,6 +35,7 @@
Description: >-
Name of an existing EC2 KeyPair to enable SSH access to the SQLImporter
EC2 instance (if none appear in drop-down menu, you need to create one)
+ Default: sock-shop-cloudformation
MinLength: '1'
ConstraintDescription: must be the name of an existing EC2 KeyPair.
Resources:
@@ -42,6 +43,7 @@
Type: AWS::Logs::LogGroup
Properties:
LogGroupName: !Ref 'AWS::StackName'
+ RetentionInDays: 7
DynamoDbTaskRole:
Type: AWS::IAM::Role
Properties:
@@ -75,6 +77,9 @@
- cidr
EnableDnsHostnames: true
EnableDnsSupport: true
+ Tags:
+ - Key: Name
+ Value: sock-shop
DhcpOptionsLocal:
Type: AWS::EC2::DHCPOptions
Properties:
@@ -103,6 +108,9 @@
- '0'
- !GetAZs
Ref: 'AWS::Region'
+ Tags:
+ - Key: Name
+ Value: public-subnet-1
PubSubnetAz2:
Type: 'AWS::EC2::Subnet'
Properties:
@@ -115,6 +123,9 @@
- '1'
- !GetAZs
Ref: 'AWS::Region'
+ Tags:
+ - Key: Name
+ Value: public-subnet-2
InternetGateway:
Type: 'AWS::EC2::InternetGateway'
AttachGateway:
@@ -148,6 +159,9 @@
Properties:
GroupDescription: ELB Allowed Ports
VpcId: !Ref Vpc
+ Tags:
+ - Key: Name
+ Value: elb-allowed-ports
ElbSecurityGroupIngressAppPort:
Type: 'AWS::EC2::SecurityGroupIngress'
Properties:
@@ -169,6 +183,9 @@
Properties:
GroupDescription: ECS Allowed Ports
VpcId: !Ref Vpc
+ Tags:
+ - Key: Name
+ Value: ecs
EcsSecurityGroupIngressSshPort:
Type: 'AWS::EC2::SecurityGroupIngress'
Properties:
@@ -295,6 +312,9 @@
ToPort: 3306
SourceSecurityGroupId: !Ref EcsSecurityGroup
VpcId: !Ref Vpc
+ Tags:
+ - Key: Name
+ Value: db-ecs
myDBSubnetGroup:
Type: 'AWS::RDS::DBSubnetGroup'
Properties:
@@ -363,7 +383,7 @@
RequiresCompatibilities:
- FARGATE
ContainerDefinitions:
- - Image: weaveworksdemos/carts
+ - Image: weaveworksdemos/carts:0.4.8
Essential: true
Name: carts
LogConfiguration:
@@ -415,7 +435,7 @@
RequiresCompatibilities:
- FARGATE
ContainerDefinitions:
- - Image: weaveworksdemos/catalogue
+ - Image: weaveworksdemos/catalogue:0.3.5
Essential: true
Name: catalogue
Command:
@@ -534,7 +554,7 @@
Options:
awslogs-group: !Ref 'AWS::StackName'
awslogs-region: !Ref 'AWS::Region'
- awslogs-stream-prefix: frontend
+ awslogs-stream-prefix: front-end
Environment:
- Name: SESSION_REDIS
Value: 'true'
@@ -1064,6 +1084,10 @@
Value: mysql
- Name: MYSQL_HOST
Value: zipkin-mysql
+ - Name: MYSQL_USER
+ Value: zipkin
+ - Name: MYSQL_PASS
+ Value: zipkin
Volumes: []
NetworkMode: awsvpc
ExecutionRoleArn: !GetAtt EcsTaskExecutionRole.Arn
@@ -1167,7 +1191,7 @@
Options:
awslogs-group: !Ref 'AWS::StackName'
awslogs-region: !Ref 'AWS::Region'
- awslogs-stream-prefix: zipkin-db
+ awslogs-stream-prefix: zipkin-mysql
PortMappings:
- ContainerPort: 3306
Volumes: []
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment