Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 / AL2 ECS (#669)
Browse files Browse the repository at this point in the history 
[Improvement] * - Support new region ap-southeast-4 (#669)
  • Loading branch information
@michaelwittig
michaelwittig committed Feb 1, 2023
1 parent 79e6a44 commit 5201cf8
Show file tree
Hide file tree
Showing 10 changed files with 255 additions and 235 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.20220316.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 ssm get-parameter --name /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2 --query Parameter.Value --output text); printf "'$region':\n AMI: '$ami'\n"; done
```
54 changes: 28 additions & 26 deletions ecs/cluster-cost-optimized.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,57 +175,59 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
ECSAMI: 'ami-080e939008d487272'
ECSAMI: 'ami-0e0c7ad40d0336284'
'ap-south-1':
ECSAMI: 'ami-072b20c3cda798d4b'
ECSAMI: 'ami-0d192d7b37f96a4e5'
'eu-south-1':
ECSAMI: 'ami-099053cfe1d4a0ada'
ECSAMI: 'ami-0e0b3868f7e82fdec'
'eu-south-2':
ECSAMI: 'ami-06a29140d098e583c'
ECSAMI: 'ami-0b442915d4dc26348'
'me-central-1':
ECSAMI: 'ami-0339f89764d339feb'
ECSAMI: 'ami-094cea0e923783ee2'
'ca-central-1':
ECSAMI: 'ami-0c18e42761be11bbd'
ECSAMI: 'ami-026d1591d100ae1a4'
'eu-central-1':
ECSAMI: 'ami-07383d4bda8b9c72b'
ECSAMI: 'ami-09e5466d2ec7c970d'
'eu-central-2':
ECSAMI: 'ami-01567ac9733913a49'
ECSAMI: 'ami-00afbe6c31512f3fd'
'us-west-1':
ECSAMI: 'ami-001f81b37439d0e4a'
ECSAMI: 'ami-080ea439df212d0a2'
'us-west-2':
ECSAMI: 'ami-06dafa1b661caec7e'
ECSAMI: 'ami-014cdb1bfb3b2584f'
'af-south-1':
ECSAMI: 'ami-0ab26be72174d9cd8'
ECSAMI: 'ami-0c7edbd1cc83eff04'
'eu-north-1':
ECSAMI: 'ami-07e8680b9268427e5'
ECSAMI: 'ami-09d79eb23e51bff52'
'eu-west-3':
ECSAMI: 'ami-096a7bcc827c5e536'
ECSAMI: 'ami-0ba1059f6d5ab5097'
'eu-west-2':
ECSAMI: 'ami-0a7fe1d4be64d0d0f'
ECSAMI: 'ami-0a9d0b31a17ab6ef5'
'eu-west-1':
ECSAMI: 'ami-00ce328eb1ed0570d'
ECSAMI: 'ami-023858f908e1b6c5a'
'ap-northeast-3':
ECSAMI: 'ami-09501c9961ca54ebc'
ECSAMI: 'ami-0a3101d12fd1ae1cc'
'ap-northeast-2':
ECSAMI: 'ami-088777ecf30673312'
ECSAMI: 'ami-04eafe1b0ceb77e37'
'me-south-1':
ECSAMI: 'ami-05ff9b1c60550aa8f'
ECSAMI: 'ami-00d6193a433249190'
'ap-northeast-1':
ECSAMI: 'ami-0374741421f827827'
ECSAMI: 'ami-0a32d9b36af77b72e'
'sa-east-1':
ECSAMI: 'ami-0862195240614edc1'
ECSAMI: 'ami-04b5858f3e8ba4259'
'ap-east-1':
ECSAMI: 'ami-06a0749a511e50635'
ECSAMI: 'ami-076633aeab371fc97'
'ap-southeast-1':
ECSAMI: 'ami-0e9b17c2a5411ea2f'
ECSAMI: 'ami-0e9a0ac4214f2ebe1'
'ap-southeast-2':
ECSAMI: 'ami-039894e835f6017fd'
ECSAMI: 'ami-02d1d818f19a85542'
'ap-southeast-3':
ECSAMI: 'ami-075e9b2563893b847'
ECSAMI: 'ami-0727bfdc69abdc5f9'
'ap-southeast-4':
ECSAMI: 'ami-0a562dabc12fa238a'
'us-east-1':
ECSAMI: 'ami-0e72545e0a1a5c759'
ECSAMI: 'ami-05e7fa5a3b6085a75'
'us-east-2':
ECSAMI: 'ami-0360083982fcb66ad'
ECSAMI: 'ami-06502972b2860f143'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
54 changes: 28 additions & 26 deletions ecs/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,57 +207,59 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
ECSAMI: 'ami-080e939008d487272'
ECSAMI: 'ami-0e0c7ad40d0336284'
'ap-south-1':
ECSAMI: 'ami-072b20c3cda798d4b'
ECSAMI: 'ami-0d192d7b37f96a4e5'
'eu-south-1':
ECSAMI: 'ami-099053cfe1d4a0ada'
ECSAMI: 'ami-0e0b3868f7e82fdec'
'eu-south-2':
ECSAMI: 'ami-06a29140d098e583c'
ECSAMI: 'ami-0b442915d4dc26348'
'me-central-1':
ECSAMI: 'ami-0339f89764d339feb'
ECSAMI: 'ami-094cea0e923783ee2'
'ca-central-1':
ECSAMI: 'ami-0c18e42761be11bbd'
ECSAMI: 'ami-026d1591d100ae1a4'
'eu-central-1':
ECSAMI: 'ami-07383d4bda8b9c72b'
ECSAMI: 'ami-09e5466d2ec7c970d'
'eu-central-2':
ECSAMI: 'ami-01567ac9733913a49'
ECSAMI: 'ami-00afbe6c31512f3fd'
'us-west-1':
ECSAMI: 'ami-001f81b37439d0e4a'
ECSAMI: 'ami-080ea439df212d0a2'
'us-west-2':
ECSAMI: 'ami-06dafa1b661caec7e'
ECSAMI: 'ami-014cdb1bfb3b2584f'
'af-south-1':
ECSAMI: 'ami-0ab26be72174d9cd8'
ECSAMI: 'ami-0c7edbd1cc83eff04'
'eu-north-1':
ECSAMI: 'ami-07e8680b9268427e5'
ECSAMI: 'ami-09d79eb23e51bff52'
'eu-west-3':
ECSAMI: 'ami-096a7bcc827c5e536'
ECSAMI: 'ami-0ba1059f6d5ab5097'
'eu-west-2':
ECSAMI: 'ami-0a7fe1d4be64d0d0f'
ECSAMI: 'ami-0a9d0b31a17ab6ef5'
'eu-west-1':
ECSAMI: 'ami-00ce328eb1ed0570d'
ECSAMI: 'ami-023858f908e1b6c5a'
'ap-northeast-3':
ECSAMI: 'ami-09501c9961ca54ebc'
ECSAMI: 'ami-0a3101d12fd1ae1cc'
'ap-northeast-2':
ECSAMI: 'ami-088777ecf30673312'
ECSAMI: 'ami-04eafe1b0ceb77e37'
'me-south-1':
ECSAMI: 'ami-05ff9b1c60550aa8f'
ECSAMI: 'ami-00d6193a433249190'
'ap-northeast-1':
ECSAMI: 'ami-0374741421f827827'
ECSAMI: 'ami-0a32d9b36af77b72e'
'sa-east-1':
ECSAMI: 'ami-0862195240614edc1'
ECSAMI: 'ami-04b5858f3e8ba4259'
'ap-east-1':
ECSAMI: 'ami-06a0749a511e50635'
ECSAMI: 'ami-076633aeab371fc97'
'ap-southeast-1':
ECSAMI: 'ami-0e9b17c2a5411ea2f'
ECSAMI: 'ami-0e9a0ac4214f2ebe1'
'ap-southeast-2':
ECSAMI: 'ami-039894e835f6017fd'
ECSAMI: 'ami-02d1d818f19a85542'
'ap-southeast-3':
ECSAMI: 'ami-075e9b2563893b847'
ECSAMI: 'ami-0727bfdc69abdc5f9'
'ap-southeast-4':
ECSAMI: 'ami-0a562dabc12fa238a'
'us-east-1':
ECSAMI: 'ami-0e72545e0a1a5c759'
ECSAMI: 'ami-05e7fa5a3b6085a75'
'us-east-2':
ECSAMI: 'ami-0360083982fcb66ad'
ECSAMI: 'ami-06502972b2860f143'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
54 changes: 28 additions & 26 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,57 +219,59 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-06fafa12df66cf763'
AMI: 'ami-048246bb5d8569bc6'
'ap-south-1':
AMI: 'ami-093613b5938a7e47c'
AMI: 'ami-04155bc230e70436c'
'eu-south-1':
AMI: 'ami-01bccc3fb927d1381'
AMI: 'ami-030b30458ad64d1a5'
'eu-south-2':
AMI: 'ami-06dead0e885b328ac'
AMI: 'ami-0aa05d0000e273011'
'me-central-1':
AMI: 'ami-021e780725d0ac833'
AMI: 'ami-08979c770d5436e80'
'ca-central-1':
AMI: 'ami-01aca21057a013fd0'
AMI: 'ami-0541bdac22613f378'
'eu-central-1':
AMI: 'ami-04a2b113b98bfa0e8'
AMI: 'ami-0dfc8449723242e36'
'eu-central-2':
AMI: 'ami-0ec30364fff59d57e'
AMI: 'ami-0509f762a42daa7d9'
'us-west-1':
AMI: 'ami-0fc161d91b03576d0'
AMI: 'ami-005d20c35ced4dc9e'
'us-west-2':
AMI: 'ami-0849a313b038afda0'
AMI: 'ami-0913c47048d853921'
'af-south-1':
AMI: 'ami-056ac3c10cb2283e3'
AMI: 'ami-0c036befd8e52887d'
'eu-north-1':
AMI: 'ami-0cf1dfc38e4c28f7d'
AMI: 'ami-09a51d72d4fbe112f'
'eu-west-3':
AMI: 'ami-065764f88497fd546'
AMI: 'ami-0163afee12c55e669'
'eu-west-2':
AMI: 'ami-02a1ade676420a021'
AMI: 'ami-0b2e759b077980407'
'eu-west-1':
AMI: 'ami-08c149f9b2ace933d'
AMI: 'ami-0e1dc7c0757fa9cdc'
'ap-northeast-3':
AMI: 'ami-0f4e7c835783812e0'
AMI: 'ami-02c87c4115ad47b94'
'ap-northeast-2':
AMI: 'ami-0a1d2fce2d3ca6e35'
AMI: 'ami-081a49548fc59d8fa'
'me-south-1':
AMI: 'ami-0d3f9b381d27950bc'
AMI: 'ami-0f9e883b64b0ec382'
'ap-northeast-1':
AMI: 'ami-0b8b7786ce75a2b4f'
AMI: 'ami-0ad64728720227ff8'
'sa-east-1':
AMI: 'ami-03faa3bc786326505'
AMI: 'ami-0a36129dfe2dca30a'
'ap-east-1':
AMI: 'ami-00a7702abd217ea2e'
AMI: 'ami-0eb5e13acd49ef200'
'ap-southeast-1':
AMI: 'ami-02c7d3513f9fdf3f6'
AMI: 'ami-04e6897ac54e2870f'
'ap-southeast-2':
AMI: 'ami-0043df2e553ad12b6'
AMI: 'ami-01ada6dc08c623d60'
'ap-southeast-3':
AMI: 'ami-089ffeb63504837b6'
AMI: 'ami-0e2b70963ad494ad2'
'ap-southeast-4':
AMI: 'ami-0de40ddaeb58da907'
'us-east-1':
AMI: 'ami-0fe472d8a85bc7b0e'
AMI: 'ami-007868005aea67c54'
'us-east-2':
AMI: 'ami-0ea1d45dcdd47edf6'
AMI: 'ami-0924fa21f01c23f6e'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
54 changes: 28 additions & 26 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,57 +167,59 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-06fafa12df66cf763'
AMI: 'ami-048246bb5d8569bc6'
'ap-south-1':
AMI: 'ami-093613b5938a7e47c'
AMI: 'ami-04155bc230e70436c'
'eu-south-1':
AMI: 'ami-01bccc3fb927d1381'
AMI: 'ami-030b30458ad64d1a5'
'eu-south-2':
AMI: 'ami-06dead0e885b328ac'
AMI: 'ami-0aa05d0000e273011'
'me-central-1':
AMI: 'ami-021e780725d0ac833'
AMI: 'ami-08979c770d5436e80'
'ca-central-1':
AMI: 'ami-01aca21057a013fd0'
AMI: 'ami-0541bdac22613f378'
'eu-central-1':
AMI: 'ami-04a2b113b98bfa0e8'
AMI: 'ami-0dfc8449723242e36'
'eu-central-2':
AMI: 'ami-0ec30364fff59d57e'
AMI: 'ami-0509f762a42daa7d9'
'us-west-1':
AMI: 'ami-0fc161d91b03576d0'
AMI: 'ami-005d20c35ced4dc9e'
'us-west-2':
AMI: 'ami-0849a313b038afda0'
AMI: 'ami-0913c47048d853921'
'af-south-1':
AMI: 'ami-056ac3c10cb2283e3'
AMI: 'ami-0c036befd8e52887d'
'eu-north-1':
AMI: 'ami-0cf1dfc38e4c28f7d'
AMI: 'ami-09a51d72d4fbe112f'
'eu-west-3':
AMI: 'ami-065764f88497fd546'
AMI: 'ami-0163afee12c55e669'
'eu-west-2':
AMI: 'ami-02a1ade676420a021'
AMI: 'ami-0b2e759b077980407'
'eu-west-1':
AMI: 'ami-08c149f9b2ace933d'
AMI: 'ami-0e1dc7c0757fa9cdc'
'ap-northeast-3':
AMI: 'ami-0f4e7c835783812e0'
AMI: 'ami-02c87c4115ad47b94'
'ap-northeast-2':
AMI: 'ami-0a1d2fce2d3ca6e35'
AMI: 'ami-081a49548fc59d8fa'
'me-south-1':
AMI: 'ami-0d3f9b381d27950bc'
AMI: 'ami-0f9e883b64b0ec382'
'ap-northeast-1':
AMI: 'ami-0b8b7786ce75a2b4f'
AMI: 'ami-0ad64728720227ff8'
'sa-east-1':
AMI: 'ami-03faa3bc786326505'
AMI: 'ami-0a36129dfe2dca30a'
'ap-east-1':
AMI: 'ami-00a7702abd217ea2e'
AMI: 'ami-0eb5e13acd49ef200'
'ap-southeast-1':
AMI: 'ami-02c7d3513f9fdf3f6'
AMI: 'ami-04e6897ac54e2870f'
'ap-southeast-2':
AMI: 'ami-0043df2e553ad12b6'
AMI: 'ami-01ada6dc08c623d60'
'ap-southeast-3':
AMI: 'ami-089ffeb63504837b6'
AMI: 'ami-0e2b70963ad494ad2'
'ap-southeast-4':
AMI: 'ami-0de40ddaeb58da907'
'us-east-1':
AMI: 'ami-0fe472d8a85bc7b0e'
AMI: 'ami-007868005aea67c54'
'us-east-2':
AMI: 'ami-0ea1d45dcdd47edf6'
AMI: 'ami-0924fa21f01c23f6e'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down

0 comments on commit 5201cf8

Please sign in to comment.