Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 / AL1 NAT (#712)
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelwittig
michaelwittig authored Oct 2, 2023
1 parent aeb5658 commit 4208f64
Show file tree
Hide file tree
Showing 9 changed files with 225 additions and 225 deletions.
56 changes: 28 additions & 28 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,61 +219,61 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-036d87c4b5e557058'
AMI: 'ami-09ec6c49d26d0518f'
'ap-south-1':
AMI: 'ami-0579bae099b504874'
AMI: 'ami-020562d2cd769c81b'
'eu-south-1':
AMI: 'ami-0a914332da537e79d'
AMI: 'ami-08a273089ab10bfda'
'eu-south-2':
AMI: 'ami-0a7d1ec93ac8b262d'
AMI: 'ami-0295ec06d7ecf07a2'
'me-central-1':
AMI: 'ami-02c1c88c0a7d21a6c'
AMI: 'ami-0911d5289b0ceaafa'
'il-central-1':
AMI: 'ami-080e21a9661f94810'
AMI: 'ami-0f552ebe7c7bc7655'
'ca-central-1':
AMI: 'ami-0634933bd8c9f5e98'
AMI: 'ami-09fa72aa5ea159b61'
'eu-central-1':
AMI: 'ami-0a2a6a10b645a609e'
AMI: 'ami-0d2820455d08be628'
'eu-central-2':
AMI: 'ami-0b6afc5be59d1af43'
AMI: 'ami-0a37533ef40d2f340'
'us-west-1':
AMI: 'ami-0f56d8f4fdaf39279'
AMI: 'ami-01cff12e087f492c6'
'us-west-2':
AMI: 'ami-00755a52896316cee'
AMI: 'ami-0044a0897b53acfb6'
'af-south-1':
AMI: 'ami-02897988d6a298cc8'
AMI: 'ami-0e0da87fdaf927717'
'eu-north-1':
AMI: 'ami-0d4f49135e57daf78'
AMI: 'ami-0312b506c46eb9f64'
'eu-west-3':
AMI: 'ami-06509bffd4252cf89'
AMI: 'ami-05d9ff5247ae93752'
'eu-west-2':
AMI: 'ami-0fc7663ee27a52476'
AMI: 'ami-0db2efede9f8bb581'
'eu-west-1':
AMI: 'ami-0aa6a4d042e0ccc31'
AMI: 'ami-052b48dff01bd3a2d'
'ap-northeast-3':
AMI: 'ami-09de0771d3499d835'
AMI: 'ami-07795c2951dc11ce7'
'ap-northeast-2':
AMI: 'ami-0ec77cfb1037681eb'
AMI: 'ami-085a10255c2ecb4cb'
'me-south-1':
AMI: 'ami-0dd2efcb1350d662f'
AMI: 'ami-0a6e54be87919a76a'
'ap-northeast-1':
AMI: 'ami-0baf2b5b1e0cfaeab'
AMI: 'ami-0e3ceefc9a200a838'
'sa-east-1':
AMI: 'ami-018cded4e74aec9cd'
AMI: 'ami-0df03a6401e7a2943'
'ap-east-1':
AMI: 'ami-01192e69f89fca9e6'
AMI: 'ami-05676b11acc4161d5'
'ap-southeast-1':
AMI: 'ami-080367f396ea04ea7'
AMI: 'ami-044d69b8549e33ff1'
'ap-southeast-2':
AMI: 'ami-046a52b150aed081a'
AMI: 'ami-0e166015f8dee9d71'
'ap-southeast-3':
AMI: 'ami-0c6c6c37ace590ed8'
AMI: 'ami-0f8159cc3ab5fffaf'
'ap-southeast-4':
AMI: 'ami-0fb1709904e070832'
AMI: 'ami-04864bb4b01bd8038'
'us-east-1':
AMI: 'ami-098143f68772b34f5'
AMI: 'ami-0d887a308369b6881'
'us-east-2':
AMI: 'ami-0dbb0f9887f1fe98f'
AMI: 'ami-0e534f3e5321ed9ed'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
Expand Down
56 changes: 28 additions & 28 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,61 +167,61 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-036d87c4b5e557058'
AMI: 'ami-09ec6c49d26d0518f'
'ap-south-1':
AMI: 'ami-0579bae099b504874'
AMI: 'ami-020562d2cd769c81b'
'eu-south-1':
AMI: 'ami-0a914332da537e79d'
AMI: 'ami-08a273089ab10bfda'
'eu-south-2':
AMI: 'ami-0a7d1ec93ac8b262d'
AMI: 'ami-0295ec06d7ecf07a2'
'me-central-1':
AMI: 'ami-02c1c88c0a7d21a6c'
AMI: 'ami-0911d5289b0ceaafa'
'il-central-1':
AMI: 'ami-080e21a9661f94810'
AMI: 'ami-0f552ebe7c7bc7655'
'ca-central-1':
AMI: 'ami-0634933bd8c9f5e98'
AMI: 'ami-09fa72aa5ea159b61'
'eu-central-1':
AMI: 'ami-0a2a6a10b645a609e'
AMI: 'ami-0d2820455d08be628'
'eu-central-2':
AMI: 'ami-0b6afc5be59d1af43'
AMI: 'ami-0a37533ef40d2f340'
'us-west-1':
AMI: 'ami-0f56d8f4fdaf39279'
AMI: 'ami-01cff12e087f492c6'
'us-west-2':
AMI: 'ami-00755a52896316cee'
AMI: 'ami-0044a0897b53acfb6'
'af-south-1':
AMI: 'ami-02897988d6a298cc8'
AMI: 'ami-0e0da87fdaf927717'
'eu-north-1':
AMI: 'ami-0d4f49135e57daf78'
AMI: 'ami-0312b506c46eb9f64'
'eu-west-3':
AMI: 'ami-06509bffd4252cf89'
AMI: 'ami-05d9ff5247ae93752'
'eu-west-2':
AMI: 'ami-0fc7663ee27a52476'
AMI: 'ami-0db2efede9f8bb581'
'eu-west-1':
AMI: 'ami-0aa6a4d042e0ccc31'
AMI: 'ami-052b48dff01bd3a2d'
'ap-northeast-3':
AMI: 'ami-09de0771d3499d835'
AMI: 'ami-07795c2951dc11ce7'
'ap-northeast-2':
AMI: 'ami-0ec77cfb1037681eb'
AMI: 'ami-085a10255c2ecb4cb'
'me-south-1':
AMI: 'ami-0dd2efcb1350d662f'
AMI: 'ami-0a6e54be87919a76a'
'ap-northeast-1':
AMI: 'ami-0baf2b5b1e0cfaeab'
AMI: 'ami-0e3ceefc9a200a838'
'sa-east-1':
AMI: 'ami-018cded4e74aec9cd'
AMI: 'ami-0df03a6401e7a2943'
'ap-east-1':
AMI: 'ami-01192e69f89fca9e6'
AMI: 'ami-05676b11acc4161d5'
'ap-southeast-1':
AMI: 'ami-080367f396ea04ea7'
AMI: 'ami-044d69b8549e33ff1'
'ap-southeast-2':
AMI: 'ami-046a52b150aed081a'
AMI: 'ami-0e166015f8dee9d71'
'ap-southeast-3':
AMI: 'ami-0c6c6c37ace590ed8'
AMI: 'ami-0f8159cc3ab5fffaf'
'ap-southeast-4':
AMI: 'ami-0fb1709904e070832'
AMI: 'ami-04864bb4b01bd8038'
'us-east-1':
AMI: 'ami-098143f68772b34f5'
AMI: 'ami-0d887a308369b6881'
'us-east-2':
AMI: 'ami-0dbb0f9887f1fe98f'
AMI: 'ami-0e534f3e5321ed9ed'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
56 changes: 28 additions & 28 deletions security/auth-proxy-ha-github-orga.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,61 +145,61 @@ Parameters:
Mappings:
RegionMap:
'ap-south-2':
AMI: 'ami-036d87c4b5e557058'
AMI: 'ami-09ec6c49d26d0518f'
'ap-south-1':
AMI: 'ami-0579bae099b504874'
AMI: 'ami-020562d2cd769c81b'
'eu-south-1':
AMI: 'ami-0a914332da537e79d'
AMI: 'ami-08a273089ab10bfda'
'eu-south-2':
AMI: 'ami-0a7d1ec93ac8b262d'
AMI: 'ami-0295ec06d7ecf07a2'
'me-central-1':
AMI: 'ami-02c1c88c0a7d21a6c'
AMI: 'ami-0911d5289b0ceaafa'
'il-central-1':
AMI: 'ami-080e21a9661f94810'
AMI: 'ami-0f552ebe7c7bc7655'
'ca-central-1':
AMI: 'ami-0634933bd8c9f5e98'
AMI: 'ami-09fa72aa5ea159b61'
'eu-central-1':
AMI: 'ami-0a2a6a10b645a609e'
AMI: 'ami-0d2820455d08be628'
'eu-central-2':
AMI: 'ami-0b6afc5be59d1af43'
AMI: 'ami-0a37533ef40d2f340'
'us-west-1':
AMI: 'ami-0f56d8f4fdaf39279'
AMI: 'ami-01cff12e087f492c6'
'us-west-2':
AMI: 'ami-00755a52896316cee'
AMI: 'ami-0044a0897b53acfb6'
'af-south-1':
AMI: 'ami-02897988d6a298cc8'
AMI: 'ami-0e0da87fdaf927717'
'eu-north-1':
AMI: 'ami-0d4f49135e57daf78'
AMI: 'ami-0312b506c46eb9f64'
'eu-west-3':
AMI: 'ami-06509bffd4252cf89'
AMI: 'ami-05d9ff5247ae93752'
'eu-west-2':
AMI: 'ami-0fc7663ee27a52476'
AMI: 'ami-0db2efede9f8bb581'
'eu-west-1':
AMI: 'ami-0aa6a4d042e0ccc31'
AMI: 'ami-052b48dff01bd3a2d'
'ap-northeast-3':
AMI: 'ami-09de0771d3499d835'
AMI: 'ami-07795c2951dc11ce7'
'ap-northeast-2':
AMI: 'ami-0ec77cfb1037681eb'
AMI: 'ami-085a10255c2ecb4cb'
'me-south-1':
AMI: 'ami-0dd2efcb1350d662f'
AMI: 'ami-0a6e54be87919a76a'
'ap-northeast-1':
AMI: 'ami-0baf2b5b1e0cfaeab'
AMI: 'ami-0e3ceefc9a200a838'
'sa-east-1':
AMI: 'ami-018cded4e74aec9cd'
AMI: 'ami-0df03a6401e7a2943'
'ap-east-1':
AMI: 'ami-01192e69f89fca9e6'
AMI: 'ami-05676b11acc4161d5'
'ap-southeast-1':
AMI: 'ami-080367f396ea04ea7'
AMI: 'ami-044d69b8549e33ff1'
'ap-southeast-2':
AMI: 'ami-046a52b150aed081a'
AMI: 'ami-0e166015f8dee9d71'
'ap-southeast-3':
AMI: 'ami-0c6c6c37ace590ed8'
AMI: 'ami-0f8159cc3ab5fffaf'
'ap-southeast-4':
AMI: 'ami-0fb1709904e070832'
AMI: 'ami-04864bb4b01bd8038'
'us-east-1':
AMI: 'ami-098143f68772b34f5'
AMI: 'ami-0d887a308369b6881'
'us-east-2':
AMI: 'ami-0dbb0f9887f1fe98f'
AMI: 'ami-0e534f3e5321ed9ed'
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 @@ -14,5 +14,5 @@ for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output

#### 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.20230905.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.20230918.0-x86_64-ebs' --query 'Images[0].ImageId' --output text); printf "'$region':\n NATAMI: '$ami'\n"; done
```
56 changes: 28 additions & 28 deletions vpc/vpc-nat-instance.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,61 +99,61 @@ Parameters:
Mappings:
RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well)
'ap-south-2':
NATAMI: 'ami-0a47d51f54aed7a49'
NATAMI: 'ami-04db8228134fd0348'
'ap-south-1':
NATAMI: 'ami-0eef2c12d70c76b97'
NATAMI: 'ami-0d72bc3916f5c4e3f'
'eu-south-1':
NATAMI: 'ami-0db9220609690f2cd'
NATAMI: 'ami-0adaf366ed21f6ac8'
'eu-south-2':
NATAMI: 'ami-082dadac4a0a62bed'
NATAMI: 'ami-06f8fd0e3e03f7ca8'
'me-central-1':
NATAMI: 'ami-0b80869f8cb20bf27'
NATAMI: 'ami-0f841582f68e4fcab'
'il-central-1':
NATAMI: 'ami-00ac640e0bbd88b97'
NATAMI: 'ami-0500414f74bc50e82'
'ca-central-1':
NATAMI: 'ami-0eb22c6acc2d3a41f'
NATAMI: 'ami-0456bc7879504f482'
'eu-central-1':
NATAMI: 'ami-07bb13258263bb380'
NATAMI: 'ami-01c795b4aaad2268e'
'eu-central-2':
NATAMI: 'ami-081c5ae8bcd975855'
NATAMI: 'ami-0665919480e8eebcb'
'us-west-1':
NATAMI: 'ami-05d6fa0984b006be0'
NATAMI: 'ami-0158169a186af8bbf'
'us-west-2':
NATAMI: 'ami-02e27c1df3363190c'
NATAMI: 'ami-0b9cc2113befaffc1'
'af-south-1':
NATAMI: 'ami-0586c3a539b42a0c2'
NATAMI: 'ami-0876eec8f285e3933'
'eu-north-1':
NATAMI: 'ami-06a23e214aa407709'
NATAMI: 'ami-085ee0efe52e19839'
'eu-west-3':
NATAMI: 'ami-0c3ff1dba5ce65f6e'
NATAMI: 'ami-0504ef8af95ce635f'
'eu-west-2':
NATAMI: 'ami-02719b84cb731adfa'
NATAMI: 'ami-0c04b9cc71427721a'
'eu-west-1':
NATAMI: 'ami-07671e7f5ef0236fd'
NATAMI: 'ami-015b58193d83be259'
'ap-northeast-3':
NATAMI: 'ami-075c1a7be90c2e3df'
NATAMI: 'ami-0abdd26c798aa8ae6'
'ap-northeast-2':
NATAMI: 'ami-08e0e136dde5ca493'
NATAMI: 'ami-035bd0fed9c9525f6'
'me-south-1':
NATAMI: 'ami-067dc4eba0789f8d9'
NATAMI: 'ami-0e770cc1fa3703fdb'
'ap-northeast-1':
NATAMI: 'ami-08db1d9f871874c24'
NATAMI: 'ami-077a0e989c1c14707'
'sa-east-1':
NATAMI: 'ami-0036678a6278e7f40'
NATAMI: 'ami-00eacee1c13aaa1c7'
'ap-east-1':
NATAMI: 'ami-07195cfd35a11d34a'
NATAMI: 'ami-01ddafdcfa3ead4ab'
'ap-southeast-1':
NATAMI: 'ami-0d1fabdaa9ee67284'
NATAMI: 'ami-04c35b4deb7ed561d'
'ap-southeast-2':
NATAMI: 'ami-068028aa95d8d44b3'
NATAMI: 'ami-06dafb7ec372d31ee'
'ap-southeast-3':
NATAMI: 'ami-053c7a4adb0e79144'
NATAMI: 'ami-01cd9f8a3f5cbb952'
'ap-southeast-4':
NATAMI: 'ami-05b9950ab3407ed5f'
NATAMI: 'ami-0dcfb60e1007b8017'
'us-east-1':
NATAMI: 'ami-0c40e34cc38756ad4'
NATAMI: 'ami-0c6dac030329381b4'
'us-east-2':
NATAMI: 'ami-079c4ed8a2b051ea3'
NATAMI: 'ami-0e7cc90bc399ce3d4'
Conditions:
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
Loading

0 comments on commit 4208f64

Please sign in to comment.