Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 / AL2 ECS (#665)
Browse files Browse the repository at this point in the history 
[Improvement] * - Support new regions ap-south-2
  • Loading branch information
@michaelwittig
michaelwittig committed Dec 19, 2022
1 parent be8aef2 commit b498863
Show file tree
Hide file tree
Showing 11 changed files with 259 additions and 237 deletions.
52 changes: 27 additions & 25 deletions ecs/cluster-cost-optimized.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,56 +174,58 @@ Parameters:
MaxValue: 3600
Mappings:
RegionMap:
'ap-south-2':
ECSAMI: 'ami-080e939008d487272'
'ap-south-1':
ECSAMI: 'ami-081a6bc7bdbafd63a'
ECSAMI: 'ami-072b20c3cda798d4b'
'eu-south-1':
ECSAMI: 'ami-0d5e6c5081a715733'
ECSAMI: 'ami-099053cfe1d4a0ada'
'eu-south-2':
ECSAMI: 'ami-071c2c0a2032e665c'
ECSAMI: 'ami-06a29140d098e583c'
'me-central-1':
ECSAMI: 'ami-0d1066a407c3c3132'
ECSAMI: 'ami-0339f89764d339feb'
'ca-central-1':
ECSAMI: 'ami-0ac94e845e99feb00'
ECSAMI: 'ami-0c18e42761be11bbd'
'eu-central-1':
ECSAMI: 'ami-0fab44817c875e415'
ECSAMI: 'ami-07383d4bda8b9c72b'
'eu-central-2':
ECSAMI: 'ami-0424108b6e72afd96'
ECSAMI: 'ami-01567ac9733913a49'
'us-west-1':
ECSAMI: 'ami-04dda3eb78d3c76f9'
ECSAMI: 'ami-001f81b37439d0e4a'
'us-west-2':
ECSAMI: 'ami-00b9dff790e659df2'
ECSAMI: 'ami-06dafa1b661caec7e'
'af-south-1':
ECSAMI: 'ami-0d8543bf2163740ae'
ECSAMI: 'ami-0ab26be72174d9cd8'
'eu-north-1':
ECSAMI: 'ami-047ff366619a25378'
ECSAMI: 'ami-07e8680b9268427e5'
'eu-west-3':
ECSAMI: 'ami-072439f1b747e6f66'
ECSAMI: 'ami-096a7bcc827c5e536'
'eu-west-2':
ECSAMI: 'ami-0d930fe5ea148b740'
ECSAMI: 'ami-0a7fe1d4be64d0d0f'
'eu-west-1':
ECSAMI: 'ami-08c011700cf146b89'
ECSAMI: 'ami-00ce328eb1ed0570d'
'ap-northeast-3':
ECSAMI: 'ami-0d66f1af6b1948b05'
ECSAMI: 'ami-09501c9961ca54ebc'
'ap-northeast-2':
ECSAMI: 'ami-07436a5dd052caf02'
ECSAMI: 'ami-088777ecf30673312'
'me-south-1':
ECSAMI: 'ami-03da374fc56be95ea'
ECSAMI: 'ami-05ff9b1c60550aa8f'
'ap-northeast-1':
ECSAMI: 'ami-0fcfb0266308303f6'
ECSAMI: 'ami-0374741421f827827'
'sa-east-1':
ECSAMI: 'ami-0f8f84c4a3c9e1ed3'
ECSAMI: 'ami-0862195240614edc1'
'ap-east-1':
ECSAMI: 'ami-0a4fbf7f8b0db42a4'
ECSAMI: 'ami-06a0749a511e50635'
'ap-southeast-1':
ECSAMI: 'ami-0b91f3efad17de577'
ECSAMI: 'ami-0e9b17c2a5411ea2f'
'ap-southeast-2':
ECSAMI: 'ami-016dfbb93297168e3'
ECSAMI: 'ami-039894e835f6017fd'
'ap-southeast-3':
ECSAMI: 'ami-01f3cb07cc12e56c2'
ECSAMI: 'ami-075e9b2563893b847'
'us-east-1':
ECSAMI: 'ami-0fe5f366c083f59ca'
ECSAMI: 'ami-0e72545e0a1a5c759'
'us-east-2':
ECSAMI: 'ami-04474aeb33af328e7'
ECSAMI: 'ami-0360083982fcb66ad'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
52 changes: 27 additions & 25 deletions ecs/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,56 +206,58 @@ Parameters:
ConstraintDescription: 'Must be >= 2'
Mappings:
RegionMap:
'ap-south-2':
ECSAMI: 'ami-080e939008d487272'
'ap-south-1':
ECSAMI: 'ami-081a6bc7bdbafd63a'
ECSAMI: 'ami-072b20c3cda798d4b'
'eu-south-1':
ECSAMI: 'ami-0d5e6c5081a715733'
ECSAMI: 'ami-099053cfe1d4a0ada'
'eu-south-2':
ECSAMI: 'ami-071c2c0a2032e665c'
ECSAMI: 'ami-06a29140d098e583c'
'me-central-1':
ECSAMI: 'ami-0d1066a407c3c3132'
ECSAMI: 'ami-0339f89764d339feb'
'ca-central-1':
ECSAMI: 'ami-0ac94e845e99feb00'
ECSAMI: 'ami-0c18e42761be11bbd'
'eu-central-1':
ECSAMI: 'ami-0fab44817c875e415'
ECSAMI: 'ami-07383d4bda8b9c72b'
'eu-central-2':
ECSAMI: 'ami-0424108b6e72afd96'
ECSAMI: 'ami-01567ac9733913a49'
'us-west-1':
ECSAMI: 'ami-04dda3eb78d3c76f9'
ECSAMI: 'ami-001f81b37439d0e4a'
'us-west-2':
ECSAMI: 'ami-00b9dff790e659df2'
ECSAMI: 'ami-06dafa1b661caec7e'
'af-south-1':
ECSAMI: 'ami-0d8543bf2163740ae'
ECSAMI: 'ami-0ab26be72174d9cd8'
'eu-north-1':
ECSAMI: 'ami-047ff366619a25378'
ECSAMI: 'ami-07e8680b9268427e5'
'eu-west-3':
ECSAMI: 'ami-072439f1b747e6f66'
ECSAMI: 'ami-096a7bcc827c5e536'
'eu-west-2':
ECSAMI: 'ami-0d930fe5ea148b740'
ECSAMI: 'ami-0a7fe1d4be64d0d0f'
'eu-west-1':
ECSAMI: 'ami-08c011700cf146b89'
ECSAMI: 'ami-00ce328eb1ed0570d'
'ap-northeast-3':
ECSAMI: 'ami-0d66f1af6b1948b05'
ECSAMI: 'ami-09501c9961ca54ebc'
'ap-northeast-2':
ECSAMI: 'ami-07436a5dd052caf02'
ECSAMI: 'ami-088777ecf30673312'
'me-south-1':
ECSAMI: 'ami-03da374fc56be95ea'
ECSAMI: 'ami-05ff9b1c60550aa8f'
'ap-northeast-1':
ECSAMI: 'ami-0fcfb0266308303f6'
ECSAMI: 'ami-0374741421f827827'
'sa-east-1':
ECSAMI: 'ami-0f8f84c4a3c9e1ed3'
ECSAMI: 'ami-0862195240614edc1'
'ap-east-1':
ECSAMI: 'ami-0a4fbf7f8b0db42a4'
ECSAMI: 'ami-06a0749a511e50635'
'ap-southeast-1':
ECSAMI: 'ami-0b91f3efad17de577'
ECSAMI: 'ami-0e9b17c2a5411ea2f'
'ap-southeast-2':
ECSAMI: 'ami-016dfbb93297168e3'
ECSAMI: 'ami-039894e835f6017fd'
'ap-southeast-3':
ECSAMI: 'ami-01f3cb07cc12e56c2'
ECSAMI: 'ami-075e9b2563893b847'
'us-east-1':
ECSAMI: 'ami-0fe5f366c083f59ca'
ECSAMI: 'ami-0e72545e0a1a5c759'
'us-east-2':
ECSAMI: 'ami-04474aeb33af328e7'
ECSAMI: 'ami-0360083982fcb66ad'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
48 changes: 25 additions & 23 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,56 +218,58 @@ Parameters:
Default: 'cron(0 5 ? * * *)'
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-06fafa12df66cf763'
'ap-south-1':
AMI: 'ami-0a2457eba250ca23d'
AMI: 'ami-093613b5938a7e47c'
'eu-south-1':
AMI: 'ami-0a5352278bc7c5131'
AMI: 'ami-01bccc3fb927d1381'
'eu-south-2':
AMI: 'ami-06dead0e885b328ac'
'me-central-1':
AMI: 'ami-0884cb015c5e68ba2'
AMI: 'ami-021e780725d0ac833'
'ca-central-1':
AMI: 'ami-017f4811a06d3e510'
AMI: 'ami-01aca21057a013fd0'
'eu-central-1':
AMI: 'ami-034a7d2833172671e'
AMI: 'ami-04a2b113b98bfa0e8'
'eu-central-2':
AMI: 'ami-0ec30364fff59d57e'
'us-west-1':
AMI: 'ami-0e587da169af43ce1'
AMI: 'ami-0fc161d91b03576d0'
'us-west-2':
AMI: 'ami-08e4eaf54ff5ee95e'
AMI: 'ami-0849a313b038afda0'
'af-south-1':
AMI: 'ami-0ad6ce76c6b363743'
AMI: 'ami-056ac3c10cb2283e3'
'eu-north-1':
AMI: 'ami-00680fd4e58e51542'
AMI: 'ami-0cf1dfc38e4c28f7d'
'eu-west-3':
AMI: 'ami-03c2abbbe8af9a7e6'
AMI: 'ami-065764f88497fd546'
'eu-west-2':
AMI: 'ami-09dca206ba8b0b1cc'
AMI: 'ami-02a1ade676420a021'
'eu-west-1':
AMI: 'ami-09958e8db3b1f3210'
AMI: 'ami-08c149f9b2ace933d'
'ap-northeast-3':
AMI: 'ami-0ca7f72edb2808742'
AMI: 'ami-0f4e7c835783812e0'
'ap-northeast-2':
AMI: 'ami-06eb68a3c20079122'
AMI: 'ami-0a1d2fce2d3ca6e35'
'me-south-1':
AMI: 'ami-0b55279ba6eea2f77'
AMI: 'ami-0d3f9b381d27950bc'
'ap-northeast-1':
AMI: 'ami-0b73aa7c1d1b2e901'
AMI: 'ami-0b8b7786ce75a2b4f'
'sa-east-1':
AMI: 'ami-0886a3d2c8b721217'
AMI: 'ami-03faa3bc786326505'
'ap-east-1':
AMI: 'ami-0e40d6716d6ef2aa4'
AMI: 'ami-00a7702abd217ea2e'
'ap-southeast-1':
AMI: 'ami-009c33adf2a03baf9'
AMI: 'ami-02c7d3513f9fdf3f6'
'ap-southeast-2':
AMI: 'ami-08efd89f971ace76d'
AMI: 'ami-0043df2e553ad12b6'
'ap-southeast-3':
AMI: 'ami-0667c5c08ef2aeddb'
AMI: 'ami-089ffeb63504837b6'
'us-east-1':
AMI: 'ami-02b972fec07f1e659'
AMI: 'ami-0fe472d8a85bc7b0e'
'us-east-2':
AMI: 'ami-0185a6f76b69a1870'
AMI: 'ami-0ea1d45dcdd47edf6'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
48 changes: 25 additions & 23 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,56 +166,58 @@ Parameters:
Default: 'cron(0 5 ? * * *)'
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-06fafa12df66cf763'
'ap-south-1':
AMI: 'ami-0a2457eba250ca23d'
AMI: 'ami-093613b5938a7e47c'
'eu-south-1':
AMI: 'ami-0a5352278bc7c5131'
AMI: 'ami-01bccc3fb927d1381'
'eu-south-2':
AMI: 'ami-06dead0e885b328ac'
'me-central-1':
AMI: 'ami-0884cb015c5e68ba2'
AMI: 'ami-021e780725d0ac833'
'ca-central-1':
AMI: 'ami-017f4811a06d3e510'
AMI: 'ami-01aca21057a013fd0'
'eu-central-1':
AMI: 'ami-034a7d2833172671e'
AMI: 'ami-04a2b113b98bfa0e8'
'eu-central-2':
AMI: 'ami-0ec30364fff59d57e'
'us-west-1':
AMI: 'ami-0e587da169af43ce1'
AMI: 'ami-0fc161d91b03576d0'
'us-west-2':
AMI: 'ami-08e4eaf54ff5ee95e'
AMI: 'ami-0849a313b038afda0'
'af-south-1':
AMI: 'ami-0ad6ce76c6b363743'
AMI: 'ami-056ac3c10cb2283e3'
'eu-north-1':
AMI: 'ami-00680fd4e58e51542'
AMI: 'ami-0cf1dfc38e4c28f7d'
'eu-west-3':
AMI: 'ami-03c2abbbe8af9a7e6'
AMI: 'ami-065764f88497fd546'
'eu-west-2':
AMI: 'ami-09dca206ba8b0b1cc'
AMI: 'ami-02a1ade676420a021'
'eu-west-1':
AMI: 'ami-09958e8db3b1f3210'
AMI: 'ami-08c149f9b2ace933d'
'ap-northeast-3':
AMI: 'ami-0ca7f72edb2808742'
AMI: 'ami-0f4e7c835783812e0'
'ap-northeast-2':
AMI: 'ami-06eb68a3c20079122'
AMI: 'ami-0a1d2fce2d3ca6e35'
'me-south-1':
AMI: 'ami-0b55279ba6eea2f77'
AMI: 'ami-0d3f9b381d27950bc'
'ap-northeast-1':
AMI: 'ami-0b73aa7c1d1b2e901'
AMI: 'ami-0b8b7786ce75a2b4f'
'sa-east-1':
AMI: 'ami-0886a3d2c8b721217'
AMI: 'ami-03faa3bc786326505'
'ap-east-1':
AMI: 'ami-0e40d6716d6ef2aa4'
AMI: 'ami-00a7702abd217ea2e'
'ap-southeast-1':
AMI: 'ami-009c33adf2a03baf9'
AMI: 'ami-02c7d3513f9fdf3f6'
'ap-southeast-2':
AMI: 'ami-08efd89f971ace76d'
AMI: 'ami-0043df2e553ad12b6'
'ap-southeast-3':
AMI: 'ami-0667c5c08ef2aeddb'
AMI: 'ami-089ffeb63504837b6'
'us-east-1':
AMI: 'ami-02b972fec07f1e659'
AMI: 'ami-0fe472d8a85bc7b0e'
'us-east-2':
AMI: 'ami-0185a6f76b69a1870'
AMI: 'ami-0ea1d45dcdd47edf6'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down

0 comments on commit b498863

Please sign in to comment.