Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 / AL2 ECS (#655) (#664)
Browse files Browse the repository at this point in the history 
[Security] * - Update Amazon Linux 2 / AL2 ECS (#664)
[Improvement] * - Support new regions eu-central-2 and eu-south-2 (#664)
  • Loading branch information
@michaelwittig
michaelwittig authored Nov 22, 2022
1 parent 318b604 commit 8c3609b
Show file tree
Hide file tree
Showing 11 changed files with 359 additions and 315 deletions.
64 changes: 34 additions & 30 deletions ecs/cluster-cost-optimized.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,52 +174,56 @@ Parameters:
MaxValue: 3600
Mappings:
RegionMap:
'ap-south-1':
ECSAMI: 'ami-081a6bc7bdbafd63a'
'eu-south-1':
ECSAMI: 'ami-0d5e6c5081a715733'
'eu-south-2':
ECSAMI: 'ami-071c2c0a2032e665c'
'me-central-1':
ECSAMI: 'ami-0d1066a407c3c3132'
'ca-central-1':
ECSAMI: 'ami-0ac94e845e99feb00'
'eu-central-1':
ECSAMI: 'ami-0fab44817c875e415'
'eu-central-2':
ECSAMI: 'ami-0424108b6e72afd96'
'us-west-1':
ECSAMI: 'ami-04dda3eb78d3c76f9'
'us-west-2':
ECSAMI: 'ami-00b9dff790e659df2'
'af-south-1':
ECSAMI: 'ami-0be224b4d422ddffa'
ECSAMI: 'ami-0d8543bf2163740ae'
'eu-north-1':
ECSAMI: 'ami-04c4cea5d874eb480'
'ap-south-1':
ECSAMI: 'ami-08db0e1881e30be69'
ECSAMI: 'ami-047ff366619a25378'
'eu-west-3':
ECSAMI: 'ami-05f31f29ba1347d15'
ECSAMI: 'ami-072439f1b747e6f66'
'eu-west-2':
ECSAMI: 'ami-02bfd81009b599d71'
'eu-south-1':
ECSAMI: 'ami-035d3a234a62abd5b'
ECSAMI: 'ami-0d930fe5ea148b740'
'eu-west-1':
ECSAMI: 'ami-0bfc7754dbd389d88'
ECSAMI: 'ami-08c011700cf146b89'
'ap-northeast-3':
ECSAMI: 'ami-0569b7f3189a3ec52'
ECSAMI: 'ami-0d66f1af6b1948b05'
'ap-northeast-2':
ECSAMI: 'ami-0dfe299a8a7fe500e'
ECSAMI: 'ami-07436a5dd052caf02'
'me-south-1':
ECSAMI: 'ami-0ed86633a7af964f7'
ECSAMI: 'ami-03da374fc56be95ea'
'ap-northeast-1':
ECSAMI: 'ami-0ed1560bb509908b1'
'me-central-1':
ECSAMI: 'ami-0d5eaf70cf19ee11f'
ECSAMI: 'ami-0fcfb0266308303f6'
'sa-east-1':
ECSAMI: 'ami-027961ea9f99b94b8'
'ca-central-1':
ECSAMI: 'ami-0720b74139c459b83'
ECSAMI: 'ami-0f8f84c4a3c9e1ed3'
'ap-east-1':
ECSAMI: 'ami-0ac9d29184f2949e4'
ECSAMI: 'ami-0a4fbf7f8b0db42a4'
'ap-southeast-1':
ECSAMI: 'ami-0996cfb3acf118b24'
ECSAMI: 'ami-0b91f3efad17de577'
'ap-southeast-2':
ECSAMI: 'ami-0ace32fdb211c83e0'
ECSAMI: 'ami-016dfbb93297168e3'
'ap-southeast-3':
ECSAMI: 'ami-0cf92ed4ce1523264'
'eu-central-1':
ECSAMI: 'ami-0479e02f9b310c857'
ECSAMI: 'ami-01f3cb07cc12e56c2'
'us-east-1':
ECSAMI: 'ami-00eb90638788e810f'
ECSAMI: 'ami-0fe5f366c083f59ca'
'us-east-2':
ECSAMI: 'ami-0b0033935e98632de'
'us-west-1':
ECSAMI: 'ami-03d937713d2d29e68'
'us-west-2':
ECSAMI: 'ami-0091142fcd273792c'
ECSAMI: 'ami-04474aeb33af328e7'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
64 changes: 34 additions & 30 deletions ecs/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,52 +206,56 @@ Parameters:
ConstraintDescription: 'Must be >= 2'
Mappings:
RegionMap:
'ap-south-1':
ECSAMI: 'ami-081a6bc7bdbafd63a'
'eu-south-1':
ECSAMI: 'ami-0d5e6c5081a715733'
'eu-south-2':
ECSAMI: 'ami-071c2c0a2032e665c'
'me-central-1':
ECSAMI: 'ami-0d1066a407c3c3132'
'ca-central-1':
ECSAMI: 'ami-0ac94e845e99feb00'
'eu-central-1':
ECSAMI: 'ami-0fab44817c875e415'
'eu-central-2':
ECSAMI: 'ami-0424108b6e72afd96'
'us-west-1':
ECSAMI: 'ami-04dda3eb78d3c76f9'
'us-west-2':
ECSAMI: 'ami-00b9dff790e659df2'
'af-south-1':
ECSAMI: 'ami-0be224b4d422ddffa'
ECSAMI: 'ami-0d8543bf2163740ae'
'eu-north-1':
ECSAMI: 'ami-04c4cea5d874eb480'
'ap-south-1':
ECSAMI: 'ami-08db0e1881e30be69'
ECSAMI: 'ami-047ff366619a25378'
'eu-west-3':
ECSAMI: 'ami-05f31f29ba1347d15'
ECSAMI: 'ami-072439f1b747e6f66'
'eu-west-2':
ECSAMI: 'ami-02bfd81009b599d71'
'eu-south-1':
ECSAMI: 'ami-035d3a234a62abd5b'
ECSAMI: 'ami-0d930fe5ea148b740'
'eu-west-1':
ECSAMI: 'ami-0bfc7754dbd389d88'
ECSAMI: 'ami-08c011700cf146b89'
'ap-northeast-3':
ECSAMI: 'ami-0569b7f3189a3ec52'
ECSAMI: 'ami-0d66f1af6b1948b05'
'ap-northeast-2':
ECSAMI: 'ami-0dfe299a8a7fe500e'
ECSAMI: 'ami-07436a5dd052caf02'
'me-south-1':
ECSAMI: 'ami-0ed86633a7af964f7'
ECSAMI: 'ami-03da374fc56be95ea'
'ap-northeast-1':
ECSAMI: 'ami-0ed1560bb509908b1'
'me-central-1':
ECSAMI: 'ami-0d5eaf70cf19ee11f'
ECSAMI: 'ami-0fcfb0266308303f6'
'sa-east-1':
ECSAMI: 'ami-027961ea9f99b94b8'
'ca-central-1':
ECSAMI: 'ami-0720b74139c459b83'
ECSAMI: 'ami-0f8f84c4a3c9e1ed3'
'ap-east-1':
ECSAMI: 'ami-0ac9d29184f2949e4'
ECSAMI: 'ami-0a4fbf7f8b0db42a4'
'ap-southeast-1':
ECSAMI: 'ami-0996cfb3acf118b24'
ECSAMI: 'ami-0b91f3efad17de577'
'ap-southeast-2':
ECSAMI: 'ami-0ace32fdb211c83e0'
ECSAMI: 'ami-016dfbb93297168e3'
'ap-southeast-3':
ECSAMI: 'ami-0cf92ed4ce1523264'
'eu-central-1':
ECSAMI: 'ami-0479e02f9b310c857'
ECSAMI: 'ami-01f3cb07cc12e56c2'
'us-east-1':
ECSAMI: 'ami-00eb90638788e810f'
ECSAMI: 'ami-0fe5f366c083f59ca'
'us-east-2':
ECSAMI: 'ami-0b0033935e98632de'
'us-west-1':
ECSAMI: 'ami-03d937713d2d29e68'
'us-west-2':
ECSAMI: 'ami-0091142fcd273792c'
ECSAMI: 'ami-04474aeb33af328e7'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
64 changes: 34 additions & 30 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,52 +218,56 @@ Parameters:
Default: 'cron(0 5 ? * * *)'
Mappings:
RegionMap:
'ap-south-1':
AMI: 'ami-0a2457eba250ca23d'
'eu-south-1':
AMI: 'ami-0a5352278bc7c5131'
'eu-south-2':
AMI: 'ami-06dead0e885b328ac'
'me-central-1':
AMI: 'ami-0884cb015c5e68ba2'
'ca-central-1':
AMI: 'ami-017f4811a06d3e510'
'eu-central-1':
AMI: 'ami-034a7d2833172671e'
'eu-central-2':
AMI: 'ami-0ec30364fff59d57e'
'us-west-1':
AMI: 'ami-0e587da169af43ce1'
'us-west-2':
AMI: 'ami-08e4eaf54ff5ee95e'
'af-south-1':
AMI: 'ami-06802a470d405f25b'
AMI: 'ami-0ad6ce76c6b363743'
'eu-north-1':
AMI: 'ami-0d8ac604c02b0cc17'
'ap-south-1':
AMI: 'ami-01f703c132f2b1a20'
AMI: 'ami-00680fd4e58e51542'
'eu-west-3':
AMI: 'ami-0a53f4992623d6f03'
AMI: 'ami-03c2abbbe8af9a7e6'
'eu-west-2':
AMI: 'ami-060c0d1361bbd1bd7'
'eu-south-1':
AMI: 'ami-04d9b6c3245fb8f5d'
AMI: 'ami-09dca206ba8b0b1cc'
'eu-west-1':
AMI: 'ami-0dcc20d3a15abf9bb'
AMI: 'ami-09958e8db3b1f3210'
'ap-northeast-3':
AMI: 'ami-0d92f0fcc82f45f80'
AMI: 'ami-0ca7f72edb2808742'
'ap-northeast-2':
AMI: 'ami-07810a490b4267374'
AMI: 'ami-06eb68a3c20079122'
'me-south-1':
AMI: 'ami-0bc65f60196533bc9'
AMI: 'ami-0b55279ba6eea2f77'
'ap-northeast-1':
AMI: 'ami-046a961f907758d0d'
'me-central-1':
AMI: 'ami-09648061d3ac08b8f'
AMI: 'ami-0b73aa7c1d1b2e901'
'sa-east-1':
AMI: 'ami-02e0498e7e54ef3c9'
'ca-central-1':
AMI: 'ami-05926d68079b85f1c'
AMI: 'ami-0886a3d2c8b721217'
'ap-east-1':
AMI: 'ami-0a94039f0f5443c97'
AMI: 'ami-0e40d6716d6ef2aa4'
'ap-southeast-1':
AMI: 'ami-0d46390da1dfb8792'
AMI: 'ami-009c33adf2a03baf9'
'ap-southeast-2':
AMI: 'ami-02b86aca723e9967e'
AMI: 'ami-08efd89f971ace76d'
'ap-southeast-3':
AMI: 'ami-006438996c3cd85c2'
'eu-central-1':
AMI: 'ami-0b920b0594b5288fb'
AMI: 'ami-0667c5c08ef2aeddb'
'us-east-1':
AMI: 'ami-0c4e4b4eb2e11d1d4'
AMI: 'ami-02b972fec07f1e659'
'us-east-2':
AMI: 'ami-07693758d0ebc2111'
'us-west-1':
AMI: 'ami-061352bb71c4724b2'
'us-west-2':
AMI: 'ami-0f9f005c313373218'
AMI: 'ami-0185a6f76b69a1870'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
64 changes: 34 additions & 30 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,52 +166,56 @@ Parameters:
Default: 'cron(0 5 ? * * *)'
Mappings:
RegionMap:
'ap-south-1':
AMI: 'ami-0a2457eba250ca23d'
'eu-south-1':
AMI: 'ami-0a5352278bc7c5131'
'eu-south-2':
AMI: 'ami-06dead0e885b328ac'
'me-central-1':
AMI: 'ami-0884cb015c5e68ba2'
'ca-central-1':
AMI: 'ami-017f4811a06d3e510'
'eu-central-1':
AMI: 'ami-034a7d2833172671e'
'eu-central-2':
AMI: 'ami-0ec30364fff59d57e'
'us-west-1':
AMI: 'ami-0e587da169af43ce1'
'us-west-2':
AMI: 'ami-08e4eaf54ff5ee95e'
'af-south-1':
AMI: 'ami-06802a470d405f25b'
AMI: 'ami-0ad6ce76c6b363743'
'eu-north-1':
AMI: 'ami-0d8ac604c02b0cc17'
'ap-south-1':
AMI: 'ami-01f703c132f2b1a20'
AMI: 'ami-00680fd4e58e51542'
'eu-west-3':
AMI: 'ami-0a53f4992623d6f03'
AMI: 'ami-03c2abbbe8af9a7e6'
'eu-west-2':
AMI: 'ami-060c0d1361bbd1bd7'
'eu-south-1':
AMI: 'ami-04d9b6c3245fb8f5d'
AMI: 'ami-09dca206ba8b0b1cc'
'eu-west-1':
AMI: 'ami-0dcc20d3a15abf9bb'
AMI: 'ami-09958e8db3b1f3210'
'ap-northeast-3':
AMI: 'ami-0d92f0fcc82f45f80'
AMI: 'ami-0ca7f72edb2808742'
'ap-northeast-2':
AMI: 'ami-07810a490b4267374'
AMI: 'ami-06eb68a3c20079122'
'me-south-1':
AMI: 'ami-0bc65f60196533bc9'
AMI: 'ami-0b55279ba6eea2f77'
'ap-northeast-1':
AMI: 'ami-046a961f907758d0d'
'me-central-1':
AMI: 'ami-09648061d3ac08b8f'
AMI: 'ami-0b73aa7c1d1b2e901'
'sa-east-1':
AMI: 'ami-02e0498e7e54ef3c9'
'ca-central-1':
AMI: 'ami-05926d68079b85f1c'
AMI: 'ami-0886a3d2c8b721217'
'ap-east-1':
AMI: 'ami-0a94039f0f5443c97'
AMI: 'ami-0e40d6716d6ef2aa4'
'ap-southeast-1':
AMI: 'ami-0d46390da1dfb8792'
AMI: 'ami-009c33adf2a03baf9'
'ap-southeast-2':
AMI: 'ami-02b86aca723e9967e'
AMI: 'ami-08efd89f971ace76d'
'ap-southeast-3':
AMI: 'ami-006438996c3cd85c2'
'eu-central-1':
AMI: 'ami-0b920b0594b5288fb'
AMI: 'ami-0667c5c08ef2aeddb'
'us-east-1':
AMI: 'ami-0c4e4b4eb2e11d1d4'
AMI: 'ami-02b972fec07f1e659'
'us-east-2':
AMI: 'ami-07693758d0ebc2111'
'us-west-1':
AMI: 'ami-061352bb71c4724b2'
'us-west-2':
AMI: 'ami-0f9f005c313373218'
AMI: 'ami-0185a6f76b69a1870'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
Loading

0 comments on commit 8c3609b

Please sign in to comment.