Skip to content

Update template.yml #101

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

Merged
merged 4 commits into from
May 18, 2023
Merged

Update template.yml #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17ce156
Update template.yml
pethers May 18, 2023
7813015
Update template.yml
pethers May 18, 2023
522523b
Update main.yml
pethers May 18, 2023
5f40502
Update app.yml
pethers May 18, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
template: cloudformation/template.yml
capabilities: CAPABILITY_NAMED_IAM
no-fail-on-empty-changeset: "1"
parameter-overrides: "DomainNamePrefix=api,GlobalTableArn=${{ env.GlobalTableZoneFrankfurt }}"
parameter-overrides: "VpcCidrPrefix=10.5,DomainNamePrefix=api,GlobalTableArn=${{ env.GlobalTableZoneFrankfurt }}"
- name: Get Output Frankfurt
run: |
HealthCheckId=`aws cloudformation describe-stacks --stack-name lambda-vpc --query "Stacks[0].Outputs[?OutputKey == 'HealthCheckId'].OutputValue" | grep -v '\[' | grep -v '\]' | xargs`
Expand Down
4 changes: 2 additions & 2 deletions cloudformation/app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Resources:
Policy:
Software:
RpoInSecs: 300
RtoInSecs: 1800
RtoInSecs: 5400
Hardware:
RpoInSecs: 0
RtoInSecs: 0
Expand All @@ -24,7 +24,7 @@ Resources:
RtoInSecs: 0
Region:
RpoInSecs: 300
RtoInSecs: 900
RtoInSecs: 3600
PolicyDescription: "Global Mission Critical"
PolicyName: GlobalMissionCritical
Tier: MissionCritical
Expand Down
12 changes: 8 additions & 4 deletions cloudformation/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Parameters:
Description: Domain name (optional), used to setup route53 dns
Type: String
Default: hack23.com
VpcCidrPrefix:
Description: The first part of the CIDR block for the VPC and subnets
Type: String
Default: "10.1"
Conditions:
deployGlobalTable: !Equals
- ''
Expand All @@ -21,7 +25,7 @@ Resources:
VPC:
Type: "AWS::EC2::VPC"
Properties:
CidrBlock: "10.1.0.0/16"
CidrBlock: !Sub "${VpcCidrPrefix}.0.0/16"
EnableDnsHostnames: true
EnableDnsSupport: true
Tags:
Expand All @@ -48,7 +52,7 @@ Resources:
PrivateSubnet1:
Type: "AWS::EC2::Subnet"
Properties:
CidrBlock: "10.1.0.0/24"
CidrBlock: !Sub "${VpcCidrPrefix}.0.0/24"
MapPublicIpOnLaunch: false
VpcId:
Ref: "VPC"
Expand All @@ -63,7 +67,7 @@ Resources:
PrivateSubnet2:
Type: "AWS::EC2::Subnet"
Properties:
CidrBlock: "10.1.1.0/24"
CidrBlock: !Sub "${VpcCidrPrefix}.1.0/24"
MapPublicIpOnLaunch: false
VpcId:
Ref: "VPC"
Expand All @@ -78,7 +82,7 @@ Resources:
PrivateSubnet3:
Type: "AWS::EC2::Subnet"
Properties:
CidrBlock: "10.1.2.0/24"
CidrBlock: !Sub "${VpcCidrPrefix}.2.0/24"
MapPublicIpOnLaunch: false
VpcId:
Ref: "VPC"
Expand Down