Skip to content

Commit

Permalink
Updating to Amazon Linux 2.0 20220218.3 (#616)
Browse files Browse the repository at this point in the history 
* Updating to Amazon Linux 2.0 20220218.3

* Updating AMI for Wordpress
  • Loading branch information
@andreaswittig
andreaswittig authored Mar 9, 2022
1 parent ce2da66 commit f60fb59
Show file tree
Hide file tree
Showing 14 changed files with 259 additions and 165 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.20220218.1-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.20220218.3-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
53 changes: 50 additions & 3 deletions ec2/al2-mutable-private.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,13 @@ 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: ['20220218.1', '20220207.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
AllowedValues: ['20220218.3', '20220218.1', '20220207.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
Mappings:
VersionMap:
'20220218.3':
Map: RegionMap202202183
'20220218.1':
Map: RegionMap20202202181
Map: RegionMap202202181
'20220207.1':
Map: RegionMap202202071
'20211223.0':
Expand All @@ -232,7 +234,52 @@ Mappings:
Map: RegionMap202002071
'20191217.0':
Map: RegionMap201912170
RegionMap20202202181:
RegionMap202202183:
'af-south-1':
AMI: 'ami-08d292fff05be4fd7'
'eu-north-1':
AMI: 'ami-0cc56fdf12f1adbf6'
'ap-south-1':
AMI: 'ami-058927a80413afd9e'
'eu-west-3':
AMI: 'ami-000fb470705e9b427'
'eu-west-2':
AMI: 'ami-0127d411688545f05'
'eu-south-1':
AMI: 'ami-09bb171d034878fa6'
'eu-west-1':
AMI: 'ami-01ddabedd99da311e'
'ap-northeast-3':
AMI: 'ami-01b2cb75ad60685ea'
'ap-northeast-2':
AMI: 'ami-036f006e994752282'
'me-south-1':
AMI: 'ami-0c622a92dda7b6ea0'
'ap-northeast-1':
AMI: 'ami-0726c1c7e01759156'
'sa-east-1':
AMI: 'ami-01f19ebd61bd11278'
'ca-central-1':
AMI: 'ami-08b873ca28bee919b'
'ap-east-1':
AMI: 'ami-0dc0e75ebff016b38'
'ap-southeast-1':
AMI: 'ami-0b65860b1b39327d1'
'ap-southeast-2':
AMI: 'ami-00b8a691539cc0039'
'eu-central-1':
AMI: 'ami-0b67cc43bc64a6060'
'ap-southeast-3':
AMI: 'ami-07d9d45b01cb0b44e'
'us-east-1':
AMI: 'ami-01b20f5ea962e3fe7'
'us-east-2':
AMI: 'ami-07e19c485c7cf2266'
'us-west-1':
AMI: 'ami-0577aef94c154720e'
'us-west-2':
AMI: 'ami-07c73ee7f59efbb9a'
RegionMap202202181:
'af-south-1':
AMI: 'ami-0d7fe0087700f21a2'
'eu-north-1':
Expand Down
53 changes: 50 additions & 3 deletions ec2/al2-mutable-public.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,13 @@ 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: ['20220218.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
AllowedValues: ['20220218.3', '20220218.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
Mappings:
VersionMap:
'20220218.3':
Map: RegionMap202202183
'20220218.1':
Map: RegionMap20202202181
Map: RegionMap202202181
'20220207.1':
Map: RegionMap202202071
'20211223.0':
Expand All @@ -232,7 +234,52 @@ Mappings:
Map: RegionMap202002071
'20191217.0':
Map: RegionMap201912170
RegionMap20202202181:
RegionMap202202183:
'af-south-1':
AMI: 'ami-08d292fff05be4fd7'
'eu-north-1':
AMI: 'ami-0cc56fdf12f1adbf6'
'ap-south-1':
AMI: 'ami-058927a80413afd9e'
'eu-west-3':
AMI: 'ami-000fb470705e9b427'
'eu-west-2':
AMI: 'ami-0127d411688545f05'
'eu-south-1':
AMI: 'ami-09bb171d034878fa6'
'eu-west-1':
AMI: 'ami-01ddabedd99da311e'
'ap-northeast-3':
AMI: 'ami-01b2cb75ad60685ea'
'ap-northeast-2':
AMI: 'ami-036f006e994752282'
'me-south-1':
AMI: 'ami-0c622a92dda7b6ea0'
'ap-northeast-1':
AMI: 'ami-0726c1c7e01759156'
'sa-east-1':
AMI: 'ami-01f19ebd61bd11278'
'ca-central-1':
AMI: 'ami-08b873ca28bee919b'
'ap-east-1':
AMI: 'ami-0dc0e75ebff016b38'
'ap-southeast-1':
AMI: 'ami-0b65860b1b39327d1'
'ap-southeast-2':
AMI: 'ami-00b8a691539cc0039'
'eu-central-1':
AMI: 'ami-0b67cc43bc64a6060'
'ap-southeast-3':
AMI: 'ami-07d9d45b01cb0b44e'
'us-east-1':
AMI: 'ami-01b20f5ea962e3fe7'
'us-east-2':
AMI: 'ami-07e19c485c7cf2266'
'us-west-1':
AMI: 'ami-0577aef94c154720e'
'us-west-2':
AMI: 'ami-07c73ee7f59efbb9a'
RegionMap202202181:
'af-south-1':
AMI: 'ami-0d7fe0087700f21a2'
'eu-north-1':
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.20220218.1-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.20220218.3-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
44 changes: 22 additions & 22 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,49 +219,49 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0d7fe0087700f21a2'
AMI: 'ami-08d292fff05be4fd7'
'eu-north-1':
AMI: 'ami-0ba3efa3b01966bcb'
AMI: 'ami-0cc56fdf12f1adbf6'
'ap-south-1':
AMI: 'ami-041aae81ed72817fd'
AMI: 'ami-058927a80413afd9e'
'eu-west-3':
AMI: 'ami-0299a65418e560db7'
AMI: 'ami-000fb470705e9b427'
'eu-west-2':
AMI: 'ami-0804a2711fa3726f3'
AMI: 'ami-0127d411688545f05'
'eu-south-1':
AMI: 'ami-0420a01403c9572b9'
AMI: 'ami-09bb171d034878fa6'
'eu-west-1':
AMI: 'ami-08754599965c30981'
AMI: 'ami-01ddabedd99da311e'
'ap-northeast-3':
AMI: 'ami-038c5e963b706eb42'
AMI: 'ami-01b2cb75ad60685ea'
'ap-northeast-2':
AMI: 'ami-0829f99d6eebc491a'
AMI: 'ami-036f006e994752282'
'me-south-1':
AMI: 'ami-0bff2679df4b5325d'
AMI: 'ami-0c622a92dda7b6ea0'
'ap-northeast-1':
AMI: 'ami-0a35e0f30c477c4ed'
AMI: 'ami-0726c1c7e01759156'
'sa-east-1':
AMI: 'ami-0e75da331852510a4'
AMI: 'ami-01f19ebd61bd11278'
'ca-central-1':
AMI: 'ami-0e299df0d6042ab19'
AMI: 'ami-08b873ca28bee919b'
'ap-east-1':
AMI: 'ami-0a9e4ecfcdcdf2ffe'
AMI: 'ami-0dc0e75ebff016b38'
'ap-southeast-1':
AMI: 'ami-04b112e8ba800ec78'
AMI: 'ami-0b65860b1b39327d1'
'ap-southeast-2':
AMI: 'ami-08d76d04928793577'
AMI: 'ami-00b8a691539cc0039'
'eu-central-1':
AMI: 'ami-0e06412e7a2ab14a2'
AMI: 'ami-0b67cc43bc64a6060'
'ap-southeast-3':
AMI: 'ami-09beff734503fcd96'
AMI: 'ami-07d9d45b01cb0b44e'
'us-east-1':
AMI: 'ami-0e322da50e0e90e21'
AMI: 'ami-01b20f5ea962e3fe7'
'us-east-2':
AMI: 'ami-059e474a5b37e133b'
AMI: 'ami-07e19c485c7cf2266'
'us-west-1':
AMI: 'ami-07747ec74364622ce'
AMI: 'ami-0577aef94c154720e'
'us-west-2':
AMI: 'ami-00656d51d312f0dee'
AMI: 'ami-07c73ee7f59efbb9a'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
44 changes: 22 additions & 22 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,49 +167,49 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0d7fe0087700f21a2'
AMI: 'ami-08d292fff05be4fd7'
'eu-north-1':
AMI: 'ami-0ba3efa3b01966bcb'
AMI: 'ami-0cc56fdf12f1adbf6'
'ap-south-1':
AMI: 'ami-041aae81ed72817fd'
AMI: 'ami-058927a80413afd9e'
'eu-west-3':
AMI: 'ami-0299a65418e560db7'
AMI: 'ami-000fb470705e9b427'
'eu-west-2':
AMI: 'ami-0804a2711fa3726f3'
AMI: 'ami-0127d411688545f05'
'eu-south-1':
AMI: 'ami-0420a01403c9572b9'
AMI: 'ami-09bb171d034878fa6'
'eu-west-1':
AMI: 'ami-08754599965c30981'
AMI: 'ami-01ddabedd99da311e'
'ap-northeast-3':
AMI: 'ami-038c5e963b706eb42'
AMI: 'ami-01b2cb75ad60685ea'
'ap-northeast-2':
AMI: 'ami-0829f99d6eebc491a'
AMI: 'ami-036f006e994752282'
'me-south-1':
AMI: 'ami-0bff2679df4b5325d'
AMI: 'ami-0c622a92dda7b6ea0'
'ap-northeast-1':
AMI: 'ami-0a35e0f30c477c4ed'
AMI: 'ami-0726c1c7e01759156'
'sa-east-1':
AMI: 'ami-0e75da331852510a4'
AMI: 'ami-01f19ebd61bd11278'
'ca-central-1':
AMI: 'ami-0e299df0d6042ab19'
AMI: 'ami-08b873ca28bee919b'
'ap-east-1':
AMI: 'ami-0a9e4ecfcdcdf2ffe'
AMI: 'ami-0dc0e75ebff016b38'
'ap-southeast-1':
AMI: 'ami-04b112e8ba800ec78'
AMI: 'ami-0b65860b1b39327d1'
'ap-southeast-2':
AMI: 'ami-08d76d04928793577'
AMI: 'ami-00b8a691539cc0039'
'eu-central-1':
AMI: 'ami-0e06412e7a2ab14a2'
AMI: 'ami-0b67cc43bc64a6060'
'ap-southeast-3':
AMI: 'ami-09beff734503fcd96'
AMI: 'ami-07d9d45b01cb0b44e'
'us-east-1':
AMI: 'ami-0e322da50e0e90e21'
AMI: 'ami-01b20f5ea962e3fe7'
'us-east-2':
AMI: 'ami-059e474a5b37e133b'
AMI: 'ami-07e19c485c7cf2266'
'us-west-1':
AMI: 'ami-07747ec74364622ce'
AMI: 'ami-0577aef94c154720e'
'us-west-2':
AMI: 'ami-00656d51d312f0dee'
AMI: 'ami-07c73ee7f59efbb9a'
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.20220218.1-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.20220218.3-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
44 changes: 22 additions & 22 deletions security/auth-proxy-ha-github-orga.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,49 +145,49 @@ Parameters:
Mappings:
RegionMap:
'af-south-1':
AMI: 'ami-0d7fe0087700f21a2'
AMI: 'ami-08d292fff05be4fd7'
'eu-north-1':
AMI: 'ami-0ba3efa3b01966bcb'
AMI: 'ami-0cc56fdf12f1adbf6'
'ap-south-1':
AMI: 'ami-041aae81ed72817fd'
AMI: 'ami-058927a80413afd9e'
'eu-west-3':
AMI: 'ami-0299a65418e560db7'
AMI: 'ami-000fb470705e9b427'
'eu-west-2':
AMI: 'ami-0804a2711fa3726f3'
AMI: 'ami-0127d411688545f05'
'eu-south-1':
AMI: 'ami-0420a01403c9572b9'
AMI: 'ami-09bb171d034878fa6'
'eu-west-1':
AMI: 'ami-08754599965c30981'
AMI: 'ami-01ddabedd99da311e'
'ap-northeast-3':
AMI: 'ami-038c5e963b706eb42'
AMI: 'ami-01b2cb75ad60685ea'
'ap-northeast-2':
AMI: 'ami-0829f99d6eebc491a'
AMI: 'ami-036f006e994752282'
'me-south-1':
AMI: 'ami-0bff2679df4b5325d'
AMI: 'ami-0c622a92dda7b6ea0'
'ap-northeast-1':
AMI: 'ami-0a35e0f30c477c4ed'
AMI: 'ami-0726c1c7e01759156'
'sa-east-1':
AMI: 'ami-0e75da331852510a4'
AMI: 'ami-01f19ebd61bd11278'
'ca-central-1':
AMI: 'ami-0e299df0d6042ab19'
AMI: 'ami-08b873ca28bee919b'
'ap-east-1':
AMI: 'ami-0a9e4ecfcdcdf2ffe'
AMI: 'ami-0dc0e75ebff016b38'
'ap-southeast-1':
AMI: 'ami-04b112e8ba800ec78'
AMI: 'ami-0b65860b1b39327d1'
'ap-southeast-2':
AMI: 'ami-08d76d04928793577'
AMI: 'ami-00b8a691539cc0039'
'eu-central-1':
AMI: 'ami-0e06412e7a2ab14a2'
AMI: 'ami-0b67cc43bc64a6060'
'ap-southeast-3':
AMI: 'ami-09beff734503fcd96'
AMI: 'ami-07d9d45b01cb0b44e'
'us-east-1':
AMI: 'ami-0e322da50e0e90e21'
AMI: 'ami-01b20f5ea962e3fe7'
'us-east-2':
AMI: 'ami-059e474a5b37e133b'
AMI: 'ami-07e19c485c7cf2266'
'us-west-1':
AMI: 'ami-07747ec74364622ce'
AMI: 'ami-0577aef94c154720e'
'us-west-2':
AMI: 'ami-00656d51d312f0dee'
AMI: 'ami-07c73ee7f59efbb9a'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
2 changes: 1 addition & 1 deletion vpc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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.20220218.1-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.20220218.3-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```

#### NATAMI
Expand Down
Loading

0 comments on commit f60fb59

Please sign in to comment.