Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 to 20210126.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelwittig
michaelwittig committed Feb 9, 2021
1 parent 8288d08 commit 972f6a4
Show file tree
Hide file tree
Showing 15 changed files with 254 additions and 168 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.20200917.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.20210126.0-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
45 changes: 44 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: ['20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
AllowedValues: ['20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
Mappings:
VersionMap:
'20210126.0':
Map: RegionMap202101260
'20200917.0':
Map: RegionMap20200917
'20200722.0':
Expand All @@ -218,6 +220,47 @@ Mappings:
Map: RegionMap202002071
'20191217.0':
Map: RegionMap201912170
RegionMap202101260:
'af-south-1':
AMI: 'ami-0438616cef15ba2ca'
'eu-north-1':
AMI: 'ami-0eb6f319b31f7092d'
'ap-south-1':
AMI: 'ami-08e0ca9924195beba'
'eu-west-3':
AMI: 'ami-0ea4a063871686f37'
'eu-west-2':
AMI: 'ami-098828924dc89ea4a'
'eu-south-1':
AMI: 'ami-0ea288dd7bb5b0251'
'eu-west-1':
AMI: 'ami-0fc970315c2d38f01'
'ap-northeast-2':
AMI: 'ami-09282971cf2faa4c9'
'me-south-1':
AMI: 'ami-0cc4f2b06b56d27e9'
'ap-northeast-1':
AMI: 'ami-0992fc94ca0f1415a'
'sa-east-1':
AMI: 'ami-089aac6323aa08aee'
'ca-central-1':
AMI: 'ami-075cfad2d9805c5f2'
'ap-east-1':
AMI: 'ami-040f64b9a031d8eb0'
'ap-southeast-1':
AMI: 'ami-0e2e44c03b85f58b3'
'ap-southeast-2':
AMI: 'ami-04f77aa5970939148'
'eu-central-1':
AMI: 'ami-0a6dc7529cd559185'
'us-east-1':
AMI: 'ami-047a51fa27710816e'
'us-east-2':
AMI: 'ami-01aab85a5e4a5a0fe'
'us-west-1':
AMI: 'ami-005c06c6de69aee84'
'us-west-2':
AMI: 'ami-0e999cbd62129e3b1'
RegionMap20200917:
'af-south-1':
AMI: 'ami-0cec12e29ebe3f0d5'
Expand Down
45 changes: 44 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: ['20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
AllowedValues: ['20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
Mappings:
VersionMap:
'20210126.0':
Map: RegionMap202101260
'20200917.0':
Map: RegionMap20200917
'20200722.0':
Expand All @@ -218,6 +220,47 @@ Mappings:
Map: RegionMap202002071
'20191217.0':
Map: RegionMap201912170
RegionMap202101260:
'af-south-1':
AMI: 'ami-0438616cef15ba2ca'
'eu-north-1':
AMI: 'ami-0eb6f319b31f7092d'
'ap-south-1':
AMI: 'ami-08e0ca9924195beba'
'eu-west-3':
AMI: 'ami-0ea4a063871686f37'
'eu-west-2':
AMI: 'ami-098828924dc89ea4a'
'eu-south-1':
AMI: 'ami-0ea288dd7bb5b0251'
'eu-west-1':
AMI: 'ami-0fc970315c2d38f01'
'ap-northeast-2':
AMI: 'ami-09282971cf2faa4c9'
'me-south-1':
AMI: 'ami-0cc4f2b06b56d27e9'
'ap-northeast-1':
AMI: 'ami-0992fc94ca0f1415a'
'sa-east-1':
AMI: 'ami-089aac6323aa08aee'
'ca-central-1':
AMI: 'ami-075cfad2d9805c5f2'
'ap-east-1':
AMI: 'ami-040f64b9a031d8eb0'
'ap-southeast-1':
AMI: 'ami-0e2e44c03b85f58b3'
'ap-southeast-2':
AMI: 'ami-04f77aa5970939148'
'eu-central-1':
AMI: 'ami-0a6dc7529cd559185'
'us-east-1':
AMI: 'ami-047a51fa27710816e'
'us-east-2':
AMI: 'ami-01aab85a5e4a5a0fe'
'us-west-1':
AMI: 'ami-005c06c6de69aee84'
'us-west-2':
AMI: 'ami-0e999cbd62129e3b1'
RegionMap20200917:
'af-south-1':
AMI: 'ami-0cec12e29ebe3f0d5'
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.20200917.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.20210126.0-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
40 changes: 20 additions & 20 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,45 +219,45 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0cec12e29ebe3f0d5'
AMI: 'ami-0438616cef15ba2ca'
'eu-north-1':
AMI: 'ami-0653812935d0743fe'
AMI: 'ami-0eb6f319b31f7092d'
'ap-south-1':
AMI: 'ami-0e306788ff2473ccb'
AMI: 'ami-08e0ca9924195beba'
'eu-west-3':
AMI: 'ami-0de12f76efe134f2f'
AMI: 'ami-0ea4a063871686f37'
'eu-west-2':
AMI: 'ami-0a669382ea0feb73a'
AMI: 'ami-098828924dc89ea4a'
'eu-south-1':
AMI: 'ami-0759301b88845d121'
AMI: 'ami-0ea288dd7bb5b0251'
'eu-west-1':
AMI: 'ami-0bb3fad3c0286ebd5'
AMI: 'ami-0fc970315c2d38f01'
'ap-northeast-2':
AMI: 'ami-03b42693dc6a7dc35'
AMI: 'ami-09282971cf2faa4c9'
'me-south-1':
AMI: 'ami-08155c9ee8b845e35'
AMI: 'ami-0cc4f2b06b56d27e9'
'ap-northeast-1':
AMI: 'ami-0ce107ae7af2e92b5'
AMI: 'ami-0992fc94ca0f1415a'
'sa-east-1':
AMI: 'ami-02898a1921d38a50b'
AMI: 'ami-089aac6323aa08aee'
'ca-central-1':
AMI: 'ami-0c2f25c1f66a1ff4d'
AMI: 'ami-075cfad2d9805c5f2'
'ap-east-1':
AMI: 'ami-814d0ff0'
AMI: 'ami-040f64b9a031d8eb0'
'ap-southeast-1':
AMI: 'ami-015a6758451df3cb9'
AMI: 'ami-0e2e44c03b85f58b3'
'ap-southeast-2':
AMI: 'ami-0f96495a064477ffb'
AMI: 'ami-04f77aa5970939148'
'eu-central-1':
AMI: 'ami-00a205cb8e06c3c4e'
AMI: 'ami-0a6dc7529cd559185'
'us-east-1':
AMI: 'ami-0947d2ba12ee1ff75'
AMI: 'ami-047a51fa27710816e'
'us-east-2':
AMI: 'ami-03657b56516ab7912'
AMI: 'ami-01aab85a5e4a5a0fe'
'us-west-1':
AMI: 'ami-0e4035ae3f70c400f'
AMI: 'ami-005c06c6de69aee84'
'us-west-2':
AMI: 'ami-0528a5175983e7f28'
AMI: 'ami-0e999cbd62129e3b1'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
40 changes: 20 additions & 20 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,45 +166,45 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0cec12e29ebe3f0d5'
AMI: 'ami-0438616cef15ba2ca'
'eu-north-1':
AMI: 'ami-0653812935d0743fe'
AMI: 'ami-0eb6f319b31f7092d'
'ap-south-1':
AMI: 'ami-0e306788ff2473ccb'
AMI: 'ami-08e0ca9924195beba'
'eu-west-3':
AMI: 'ami-0de12f76efe134f2f'
AMI: 'ami-0ea4a063871686f37'
'eu-west-2':
AMI: 'ami-0a669382ea0feb73a'
AMI: 'ami-098828924dc89ea4a'
'eu-south-1':
AMI: 'ami-0759301b88845d121'
AMI: 'ami-0ea288dd7bb5b0251'
'eu-west-1':
AMI: 'ami-0bb3fad3c0286ebd5'
AMI: 'ami-0fc970315c2d38f01'
'ap-northeast-2':
AMI: 'ami-03b42693dc6a7dc35'
AMI: 'ami-09282971cf2faa4c9'
'me-south-1':
AMI: 'ami-08155c9ee8b845e35'
AMI: 'ami-0cc4f2b06b56d27e9'
'ap-northeast-1':
AMI: 'ami-0ce107ae7af2e92b5'
AMI: 'ami-0992fc94ca0f1415a'
'sa-east-1':
AMI: 'ami-02898a1921d38a50b'
AMI: 'ami-089aac6323aa08aee'
'ca-central-1':
AMI: 'ami-0c2f25c1f66a1ff4d'
AMI: 'ami-075cfad2d9805c5f2'
'ap-east-1':
AMI: 'ami-814d0ff0'
AMI: 'ami-040f64b9a031d8eb0'
'ap-southeast-1':
AMI: 'ami-015a6758451df3cb9'
AMI: 'ami-0e2e44c03b85f58b3'
'ap-southeast-2':
AMI: 'ami-0f96495a064477ffb'
AMI: 'ami-04f77aa5970939148'
'eu-central-1':
AMI: 'ami-00a205cb8e06c3c4e'
AMI: 'ami-0a6dc7529cd559185'
'us-east-1':
AMI: 'ami-0947d2ba12ee1ff75'
AMI: 'ami-047a51fa27710816e'
'us-east-2':
AMI: 'ami-03657b56516ab7912'
AMI: 'ami-01aab85a5e4a5a0fe'
'us-west-1':
AMI: 'ami-0e4035ae3f70c400f'
AMI: 'ami-005c06c6de69aee84'
'us-west-2':
AMI: 'ami-0528a5175983e7f28'
AMI: 'ami-0e999cbd62129e3b1'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
2 changes: 1 addition & 1 deletion security/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/security/
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.20200917.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.20210126.0-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
40 changes: 20 additions & 20 deletions security/auth-proxy-ha-github-orga.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,45 +145,45 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0cec12e29ebe3f0d5'
AMI: 'ami-0438616cef15ba2ca'
'eu-north-1':
AMI: 'ami-0653812935d0743fe'
AMI: 'ami-0eb6f319b31f7092d'
'ap-south-1':
AMI: 'ami-0e306788ff2473ccb'
AMI: 'ami-08e0ca9924195beba'
'eu-west-3':
AMI: 'ami-0de12f76efe134f2f'
AMI: 'ami-0ea4a063871686f37'
'eu-west-2':
AMI: 'ami-0a669382ea0feb73a'
AMI: 'ami-098828924dc89ea4a'
'eu-south-1':
AMI: 'ami-0759301b88845d121'
AMI: 'ami-0ea288dd7bb5b0251'
'eu-west-1':
AMI: 'ami-0bb3fad3c0286ebd5'
AMI: 'ami-0fc970315c2d38f01'
'ap-northeast-2':
AMI: 'ami-03b42693dc6a7dc35'
AMI: 'ami-09282971cf2faa4c9'
'me-south-1':
AMI: 'ami-08155c9ee8b845e35'
AMI: 'ami-0cc4f2b06b56d27e9'
'ap-northeast-1':
AMI: 'ami-0ce107ae7af2e92b5'
AMI: 'ami-0992fc94ca0f1415a'
'sa-east-1':
AMI: 'ami-02898a1921d38a50b'
AMI: 'ami-089aac6323aa08aee'
'ca-central-1':
AMI: 'ami-0c2f25c1f66a1ff4d'
AMI: 'ami-075cfad2d9805c5f2'
'ap-east-1':
AMI: 'ami-814d0ff0'
AMI: 'ami-040f64b9a031d8eb0'
'ap-southeast-1':
AMI: 'ami-015a6758451df3cb9'
AMI: 'ami-0e2e44c03b85f58b3'
'ap-southeast-2':
AMI: 'ami-0f96495a064477ffb'
AMI: 'ami-04f77aa5970939148'
'eu-central-1':
AMI: 'ami-00a205cb8e06c3c4e'
AMI: 'ami-0a6dc7529cd559185'
'us-east-1':
AMI: 'ami-0947d2ba12ee1ff75'
AMI: 'ami-047a51fa27710816e'
'us-east-2':
AMI: 'ami-03657b56516ab7912'
AMI: 'ami-01aab85a5e4a5a0fe'
'us-west-1':
AMI: 'ami-0e4035ae3f70c400f'
AMI: 'ami-005c06c6de69aee84'
'us-west-2':
AMI: 'ami-0528a5175983e7f28'
AMI: 'ami-0e999cbd62129e3b1'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
4 changes: 2 additions & 2 deletions vpc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ To update the region map execute the following lines in your terminal:

#### AMI
```
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.20200917.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.20210126.0-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```

#### NATAMI
```
for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn-ami-vpc-nat-2018.03.0.20200918.0-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n NATAMI: '$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=amzn-ami-vpc-nat-2018.03.0.20210126.1-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n NATAMI: '$ami'\n"; done
```
Loading

0 comments on commit 972f6a4

Please sign in to comment.