Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 to 20210721.2
Browse files Browse the repository at this point in the history 
[Security] ecs/* - Update Amazon Linux 2 ECS-optimized to 20210723
[Security] vpc/vpc-nat-instance - Update Amazon Linux NAT to 2018.03.0.20210721.0
  • Loading branch information
@michaelwittig
michaelwittig committed Jul 30, 2021
1 parent 49591d2 commit 2d4c885
Show file tree
Hide file tree
Showing 18 changed files with 309 additions and 219 deletions.
2 changes: 1 addition & 1 deletion ec2/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/ec2/
To update the region map execute the following lines in your terminal:

```
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210701.0-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
47 changes: 46 additions & 1 deletion ec2/al2-mutable-private.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,11 @@ Parameters:
Description: 'Version of Amazon Linux 2 to boot from the first time (ignored if RestoreImageId is set; select the latest version for new stacks; OS updates are enabled to patch the system).'
Type: String
Default: '20191217.0'
AllowedValues: ['20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
AllowedValues: ['20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
Mappings:
VersionMap:
'20210721.2':
Map: RegionMap202107212
'20210617.0':
Map: RegionMap202106170
'20210126.0':
Expand All @@ -222,6 +224,49 @@ Mappings:
Map: RegionMap202002071
'20191217.0':
Map: RegionMap201912170
RegionMap202107212:
'af-south-1':
AMI: 'ami-0edec67949fd25461'
'eu-north-1':
AMI: 'ami-0d441f5643da997cb'
'ap-south-1':
AMI: 'ami-04db49c0fb2215364'
'eu-west-3':
AMI: 'ami-0d49cec198762b78c'
'eu-west-2':
AMI: 'ami-0d26eb3972b7f8c96'
'eu-south-1':
AMI: 'ami-0fce326033a239d55'
'eu-west-1':
AMI: 'ami-02b4e72b17337d6c1'
'ap-northeast-3':
AMI: 'ami-0e787554e61105680'
'ap-northeast-2':
AMI: 'ami-0a0de518b1fc4524c'
'me-south-1':
AMI: 'ami-004b77593bd476317'
'ap-northeast-1':
AMI: 'ami-09ebacdc178ae23b7'
'sa-east-1':
AMI: 'ami-0f8243a5175208e08'
'ca-central-1':
AMI: 'ami-02f84cf47c23f1769'
'ap-east-1':
AMI: 'ami-0a2115f8cc0a3956b'
'ap-southeast-1':
AMI: 'ami-0f511ead81ccde020'
'ap-southeast-2':
AMI: 'ami-0aab712d6363da7f9'
'eu-central-1':
AMI: 'ami-0453cb7b5f2b7fca2'
'us-east-1':
AMI: 'ami-0c2b8ca1dad447f8a'
'us-east-2':
AMI: 'ami-0443305dabd4be2bc'
'us-west-1':
AMI: 'ami-04b6c97b14c54de18'
'us-west-2':
AMI: 'ami-083ac7c7ecf9bb9b0'
RegionMap202106170:
'af-south-1':
AMI: 'ami-0a797f6e4448b3b6f'
Expand Down
47 changes: 46 additions & 1 deletion ec2/al2-mutable-public.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,11 @@ Parameters:
Description: 'Version of Amazon Linux 2 to boot from the first time (ignored if RestoreImageId is set; select the latest version for new stacks; OS updates are enabled to patch the system).'
Type: String
Default: '20191217.0'
AllowedValues: ['20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
AllowedValues: ['20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
Mappings:
VersionMap:
'20210721.2':
Map: RegionMap202107212
'20210617.0':
Map: RegionMap202106170
'20210126.0':
Expand All @@ -222,6 +224,49 @@ Mappings:
Map: RegionMap202002071
'20191217.0':
Map: RegionMap201912170
RegionMap202107212:
'af-south-1':
AMI: 'ami-0edec67949fd25461'
'eu-north-1':
AMI: 'ami-0d441f5643da997cb'
'ap-south-1':
AMI: 'ami-04db49c0fb2215364'
'eu-west-3':
AMI: 'ami-0d49cec198762b78c'
'eu-west-2':
AMI: 'ami-0d26eb3972b7f8c96'
'eu-south-1':
AMI: 'ami-0fce326033a239d55'
'eu-west-1':
AMI: 'ami-02b4e72b17337d6c1'
'ap-northeast-3':
AMI: 'ami-0e787554e61105680'
'ap-northeast-2':
AMI: 'ami-0a0de518b1fc4524c'
'me-south-1':
AMI: 'ami-004b77593bd476317'
'ap-northeast-1':
AMI: 'ami-09ebacdc178ae23b7'
'sa-east-1':
AMI: 'ami-0f8243a5175208e08'
'ca-central-1':
AMI: 'ami-02f84cf47c23f1769'
'ap-east-1':
AMI: 'ami-0a2115f8cc0a3956b'
'ap-southeast-1':
AMI: 'ami-0f511ead81ccde020'
'ap-southeast-2':
AMI: 'ami-0aab712d6363da7f9'
'eu-central-1':
AMI: 'ami-0453cb7b5f2b7fca2'
'us-east-1':
AMI: 'ami-0c2b8ca1dad447f8a'
'us-east-2':
AMI: 'ami-0443305dabd4be2bc'
'us-west-1':
AMI: 'ami-04b6c97b14c54de18'
'us-west-2':
AMI: 'ami-083ac7c7ecf9bb9b0'
RegionMap202106170:
'af-south-1':
AMI: 'ami-0a797f6e4448b3b6f'
Expand Down
2 changes: 1 addition & 1 deletion ecs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/ecs/
To update the region map execute the following lines in your terminal:

```
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20210708-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20210723-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done
```
42 changes: 21 additions & 21 deletions ecs/cluster-cost-optimized.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,47 +175,47 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
ECSAMI: 'ami-04842aeee9d5ea28f'
ECSAMI: 'ami-021226f834258c2e8'
'eu-north-1':
ECSAMI: 'ami-0013c1b32839ee375'
ECSAMI: 'ami-0f3c0e5b74d8df5a7'
'ap-south-1':
ECSAMI: 'ami-0c22194571cbc7f59'
ECSAMI: 'ami-0fd39ae05e1da03c0'
'eu-west-3':
ECSAMI: 'ami-098b0a8e497d07ea6'
ECSAMI: 'ami-094711aebfd2b111b'
'eu-west-2':
ECSAMI: 'ami-05db1ea966500fa94'
ECSAMI: 'ami-060618797d1decb3e'
'eu-south-1':
ECSAMI: 'ami-05aa765ccabad9c5b'
ECSAMI: 'ami-08d50a8eb2e557951'
'eu-west-1':
ECSAMI: 'ami-0de862d4b125bff51'
ECSAMI: 'ami-03d256b62e46142e5'
'ap-northeast-3':
ECSAMI: 'ami-01349c08a30d7c1a1'
ECSAMI: 'ami-0debaaf41a8a02bc4'
'ap-northeast-2':
ECSAMI: 'ami-082f37c86c84b5516'
ECSAMI: 'ami-0bd002eaae0485874'
'me-south-1':
ECSAMI: 'ami-08bbfc11ec05187ac'
ECSAMI: 'ami-02183f13e2aa96970'
'ap-northeast-1':
ECSAMI: 'ami-04d327adfa9bb42d4'
ECSAMI: 'ami-02898546ea44fc778'
'sa-east-1':
ECSAMI: 'ami-098004d25e16f81c6'
ECSAMI: 'ami-051b03c7f6f2e0175'
'ca-central-1':
ECSAMI: 'ami-0a2069a4a4d1a023e'
ECSAMI: 'ami-025373a49914a3494'
'ap-east-1':
ECSAMI: 'ami-035d4e75c3e8dabe1'
ECSAMI: 'ami-08b2827e1fea0a4f9'
'ap-southeast-1':
ECSAMI: 'ami-0920ef3608aa17d63'
ECSAMI: 'ami-085fd8639f8b2ad71'
'ap-southeast-2':
ECSAMI: 'ami-0b9afce559a2ee58e'
ECSAMI: 'ami-0432fca19dd3ca234'
'eu-central-1':
ECSAMI: 'ami-0685fb9bda85b2783'
ECSAMI: 'ami-0114eb74b66592f8b'
'us-east-1':
ECSAMI: 'ami-091aa67fccd794d5f'
ECSAMI: 'ami-09d2c35d7664ddd48'
'us-east-2':
ECSAMI: 'ami-0d0e8e2b59ca814d7'
ECSAMI: 'ami-00b70fb5bca6ac778'
'us-west-1':
ECSAMI: 'ami-0b5e981d24da0039b'
ECSAMI: 'ami-046185e5373558eba'
'us-west-2':
ECSAMI: 'ami-0661fc0d6b5edc528'
ECSAMI: 'ami-0b2bd1a0c09913fd8'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
42 changes: 21 additions & 21 deletions ecs/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,47 +207,47 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
ECSAMI: 'ami-04842aeee9d5ea28f'
ECSAMI: 'ami-021226f834258c2e8'
'eu-north-1':
ECSAMI: 'ami-0013c1b32839ee375'
ECSAMI: 'ami-0f3c0e5b74d8df5a7'
'ap-south-1':
ECSAMI: 'ami-0c22194571cbc7f59'
ECSAMI: 'ami-0fd39ae05e1da03c0'
'eu-west-3':
ECSAMI: 'ami-098b0a8e497d07ea6'
ECSAMI: 'ami-094711aebfd2b111b'
'eu-west-2':
ECSAMI: 'ami-05db1ea966500fa94'
ECSAMI: 'ami-060618797d1decb3e'
'eu-south-1':
ECSAMI: 'ami-05aa765ccabad9c5b'
ECSAMI: 'ami-08d50a8eb2e557951'
'eu-west-1':
ECSAMI: 'ami-0de862d4b125bff51'
ECSAMI: 'ami-03d256b62e46142e5'
'ap-northeast-3':
ECSAMI: 'ami-01349c08a30d7c1a1'
ECSAMI: 'ami-0debaaf41a8a02bc4'
'ap-northeast-2':
ECSAMI: 'ami-082f37c86c84b5516'
ECSAMI: 'ami-0bd002eaae0485874'
'me-south-1':
ECSAMI: 'ami-08bbfc11ec05187ac'
ECSAMI: 'ami-02183f13e2aa96970'
'ap-northeast-1':
ECSAMI: 'ami-04d327adfa9bb42d4'
ECSAMI: 'ami-02898546ea44fc778'
'sa-east-1':
ECSAMI: 'ami-098004d25e16f81c6'
ECSAMI: 'ami-051b03c7f6f2e0175'
'ca-central-1':
ECSAMI: 'ami-0a2069a4a4d1a023e'
ECSAMI: 'ami-025373a49914a3494'
'ap-east-1':
ECSAMI: 'ami-035d4e75c3e8dabe1'
ECSAMI: 'ami-08b2827e1fea0a4f9'
'ap-southeast-1':
ECSAMI: 'ami-0920ef3608aa17d63'
ECSAMI: 'ami-085fd8639f8b2ad71'
'ap-southeast-2':
ECSAMI: 'ami-0b9afce559a2ee58e'
ECSAMI: 'ami-0432fca19dd3ca234'
'eu-central-1':
ECSAMI: 'ami-0685fb9bda85b2783'
ECSAMI: 'ami-0114eb74b66592f8b'
'us-east-1':
ECSAMI: 'ami-091aa67fccd794d5f'
ECSAMI: 'ami-09d2c35d7664ddd48'
'us-east-2':
ECSAMI: 'ami-0d0e8e2b59ca814d7'
ECSAMI: 'ami-00b70fb5bca6ac778'
'us-west-1':
ECSAMI: 'ami-0b5e981d24da0039b'
ECSAMI: 'ami-046185e5373558eba'
'us-west-2':
ECSAMI: 'ami-0661fc0d6b5edc528'
ECSAMI: 'ami-0b2bd1a0c09913fd8'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
2 changes: 1 addition & 1 deletion jenkins/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/jenkins/
To update the region map execute the following lines in your terminal:

```
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210701.0-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
42 changes: 21 additions & 21 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,47 +219,47 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0c4d743431fd7abbf'
AMI: 'ami-0edec67949fd25461'
'eu-north-1':
AMI: 'ami-00517306b63c4628c'
AMI: 'ami-0d441f5643da997cb'
'ap-south-1':
AMI: 'ami-00bf4ae5a7909786c'
AMI: 'ami-04db49c0fb2215364'
'eu-west-3':
AMI: 'ami-062fdd189639d3e93'
AMI: 'ami-0d49cec198762b78c'
'eu-west-2':
AMI: 'ami-03ac5a9b225e99b02'
AMI: 'ami-0d26eb3972b7f8c96'
'eu-south-1':
AMI: 'ami-0737455407c1986d6'
AMI: 'ami-0fce326033a239d55'
'eu-west-1':
AMI: 'ami-058b1b7fe545997ae'
AMI: 'ami-02b4e72b17337d6c1'
'ap-northeast-3':
AMI: 'ami-07420201371095f81'
AMI: 'ami-0e787554e61105680'
'ap-northeast-2':
AMI: 'ami-0b827f3319f7447c6'
AMI: 'ami-0a0de518b1fc4524c'
'me-south-1':
AMI: 'ami-0e3b5e402e6d8bb6b'
AMI: 'ami-004b77593bd476317'
'ap-northeast-1':
AMI: 'ami-0b276ad63ba2d6009'
AMI: 'ami-09ebacdc178ae23b7'
'sa-east-1':
AMI: 'ami-05e809fbeee38dd5e'
AMI: 'ami-0f8243a5175208e08'
'ca-central-1':
AMI: 'ami-0db72f413fc1ddb2a'
AMI: 'ami-02f84cf47c23f1769'
'ap-east-1':
AMI: 'ami-0578411ef03029669'
AMI: 'ami-0a2115f8cc0a3956b'
'ap-southeast-1':
AMI: 'ami-0e5182fad1edfaa68'
AMI: 'ami-0f511ead81ccde020'
'ap-southeast-2':
AMI: 'ami-0c9fe0dec6325a30c'
AMI: 'ami-0aab712d6363da7f9'
'eu-central-1':
AMI: 'ami-00f22f6155d6d92c5'
AMI: 'ami-0453cb7b5f2b7fca2'
'us-east-1':
AMI: 'ami-0dc2d3e4c0f9ebd18'
AMI: 'ami-0c2b8ca1dad447f8a'
'us-east-2':
AMI: 'ami-0233c2d874b811deb'
AMI: 'ami-0443305dabd4be2bc'
'us-west-1':
AMI: 'ami-0ed05376b59b90e46'
AMI: 'ami-04b6c97b14c54de18'
'us-west-2':
AMI: 'ami-0dc8f589abe99f538'
AMI: 'ami-083ac7c7ecf9bb9b0'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
Loading

0 comments on commit 2d4c885

Please sign in to comment.