Skip to content

Commit 4208f64

Browse files
michaelwittigmichaelwittig
authored
[Security] * - Update Amazon Linux 2 / AL1 NAT (#712)
1 parent aeb5658 commit 4208f64

9 files changed

Lines changed: 225 additions & 225 deletions

‎jenkins/jenkins2-ha-agents.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -219,61 +219,61 @@ Parameters:
219219
Mappings:
220220
RegionMap:
221221
'ap-south-2':
222-
AMI: 'ami-036d87c4b5e557058'
222+
AMI: 'ami-09ec6c49d26d0518f'
223223
'ap-south-1':
224-
AMI: 'ami-0579bae099b504874'
224+
AMI: 'ami-020562d2cd769c81b'
225225
'eu-south-1':
226-
AMI: 'ami-0a914332da537e79d'
226+
AMI: 'ami-08a273089ab10bfda'
227227
'eu-south-2':
228-
AMI: 'ami-0a7d1ec93ac8b262d'
228+
AMI: 'ami-0295ec06d7ecf07a2'
229229
'me-central-1':
230-
AMI: 'ami-02c1c88c0a7d21a6c'
230+
AMI: 'ami-0911d5289b0ceaafa'
231231
'il-central-1':
232-
AMI: 'ami-080e21a9661f94810'
232+
AMI: 'ami-0f552ebe7c7bc7655'
233233
'ca-central-1':
234-
AMI: 'ami-0634933bd8c9f5e98'
234+
AMI: 'ami-09fa72aa5ea159b61'
235235
'eu-central-1':
236-
AMI: 'ami-0a2a6a10b645a609e'
236+
AMI: 'ami-0d2820455d08be628'
237237
'eu-central-2':
238-
AMI: 'ami-0b6afc5be59d1af43'
238+
AMI: 'ami-0a37533ef40d2f340'
239239
'us-west-1':
240-
AMI: 'ami-0f56d8f4fdaf39279'
240+
AMI: 'ami-01cff12e087f492c6'
241241
'us-west-2':
242-
AMI: 'ami-00755a52896316cee'
242+
AMI: 'ami-0044a0897b53acfb6'
243243
'af-south-1':
244-
AMI: 'ami-02897988d6a298cc8'
244+
AMI: 'ami-0e0da87fdaf927717'
245245
'eu-north-1':
246-
AMI: 'ami-0d4f49135e57daf78'
246+
AMI: 'ami-0312b506c46eb9f64'
247247
'eu-west-3':
248-
AMI: 'ami-06509bffd4252cf89'
248+
AMI: 'ami-05d9ff5247ae93752'
249249
'eu-west-2':
250-
AMI: 'ami-0fc7663ee27a52476'
250+
AMI: 'ami-0db2efede9f8bb581'
251251
'eu-west-1':
252-
AMI: 'ami-0aa6a4d042e0ccc31'
252+
AMI: 'ami-052b48dff01bd3a2d'
253253
'ap-northeast-3':
254-
AMI: 'ami-09de0771d3499d835'
254+
AMI: 'ami-07795c2951dc11ce7'
255255
'ap-northeast-2':
256-
AMI: 'ami-0ec77cfb1037681eb'
256+
AMI: 'ami-085a10255c2ecb4cb'
257257
'me-south-1':
258-
AMI: 'ami-0dd2efcb1350d662f'
258+
AMI: 'ami-0a6e54be87919a76a'
259259
'ap-northeast-1':
260-
AMI: 'ami-0baf2b5b1e0cfaeab'
260+
AMI: 'ami-0e3ceefc9a200a838'
261261
'sa-east-1':
262-
AMI: 'ami-018cded4e74aec9cd'
262+
AMI: 'ami-0df03a6401e7a2943'
263263
'ap-east-1':
264-
AMI: 'ami-01192e69f89fca9e6'
264+
AMI: 'ami-05676b11acc4161d5'
265265
'ap-southeast-1':
266-
AMI: 'ami-080367f396ea04ea7'
266+
AMI: 'ami-044d69b8549e33ff1'
267267
'ap-southeast-2':
268-
AMI: 'ami-046a52b150aed081a'
268+
AMI: 'ami-0e166015f8dee9d71'
269269
'ap-southeast-3':
270-
AMI: 'ami-0c6c6c37ace590ed8'
270+
AMI: 'ami-0f8159cc3ab5fffaf'
271271
'ap-southeast-4':
272-
AMI: 'ami-0fb1709904e070832'
272+
AMI: 'ami-04864bb4b01bd8038'
273273
'us-east-1':
274-
AMI: 'ami-098143f68772b34f5'
274+
AMI: 'ami-0d887a308369b6881'
275275
'us-east-2':
276-
AMI: 'ami-0dbb0f9887f1fe98f'
276+
AMI: 'ami-0e534f3e5321ed9ed'
277277
Conditions:
278278
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
279279
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']

‎jenkins/jenkins2-ha.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -167,61 +167,61 @@ Parameters:
167167
Mappings:
168168
RegionMap:
169169
'ap-south-2':
170-
AMI: 'ami-036d87c4b5e557058'
170+
AMI: 'ami-09ec6c49d26d0518f'
171171
'ap-south-1':
172-
AMI: 'ami-0579bae099b504874'
172+
AMI: 'ami-020562d2cd769c81b'
173173
'eu-south-1':
174-
AMI: 'ami-0a914332da537e79d'
174+
AMI: 'ami-08a273089ab10bfda'
175175
'eu-south-2':
176-
AMI: 'ami-0a7d1ec93ac8b262d'
176+
AMI: 'ami-0295ec06d7ecf07a2'
177177
'me-central-1':
178-
AMI: 'ami-02c1c88c0a7d21a6c'
178+
AMI: 'ami-0911d5289b0ceaafa'
179179
'il-central-1':
180-
AMI: 'ami-080e21a9661f94810'
180+
AMI: 'ami-0f552ebe7c7bc7655'
181181
'ca-central-1':
182-
AMI: 'ami-0634933bd8c9f5e98'
182+
AMI: 'ami-09fa72aa5ea159b61'
183183
'eu-central-1':
184-
AMI: 'ami-0a2a6a10b645a609e'
184+
AMI: 'ami-0d2820455d08be628'
185185
'eu-central-2':
186-
AMI: 'ami-0b6afc5be59d1af43'
186+
AMI: 'ami-0a37533ef40d2f340'
187187
'us-west-1':
188-
AMI: 'ami-0f56d8f4fdaf39279'
188+
AMI: 'ami-01cff12e087f492c6'
189189
'us-west-2':
190-
AMI: 'ami-00755a52896316cee'
190+
AMI: 'ami-0044a0897b53acfb6'
191191
'af-south-1':
192-
AMI: 'ami-02897988d6a298cc8'
192+
AMI: 'ami-0e0da87fdaf927717'
193193
'eu-north-1':
194-
AMI: 'ami-0d4f49135e57daf78'
194+
AMI: 'ami-0312b506c46eb9f64'
195195
'eu-west-3':
196-
AMI: 'ami-06509bffd4252cf89'
196+
AMI: 'ami-05d9ff5247ae93752'
197197
'eu-west-2':
198-
AMI: 'ami-0fc7663ee27a52476'
198+
AMI: 'ami-0db2efede9f8bb581'
199199
'eu-west-1':
200-
AMI: 'ami-0aa6a4d042e0ccc31'
200+
AMI: 'ami-052b48dff01bd3a2d'
201201
'ap-northeast-3':
202-
AMI: 'ami-09de0771d3499d835'
202+
AMI: 'ami-07795c2951dc11ce7'
203203
'ap-northeast-2':
204-
AMI: 'ami-0ec77cfb1037681eb'
204+
AMI: 'ami-085a10255c2ecb4cb'
205205
'me-south-1':
206-
AMI: 'ami-0dd2efcb1350d662f'
206+
AMI: 'ami-0a6e54be87919a76a'
207207
'ap-northeast-1':
208-
AMI: 'ami-0baf2b5b1e0cfaeab'
208+
AMI: 'ami-0e3ceefc9a200a838'
209209
'sa-east-1':
210-
AMI: 'ami-018cded4e74aec9cd'
210+
AMI: 'ami-0df03a6401e7a2943'
211211
'ap-east-1':
212-
AMI: 'ami-01192e69f89fca9e6'
212+
AMI: 'ami-05676b11acc4161d5'
213213
'ap-southeast-1':
214-
AMI: 'ami-080367f396ea04ea7'
214+
AMI: 'ami-044d69b8549e33ff1'
215215
'ap-southeast-2':
216-
AMI: 'ami-046a52b150aed081a'
216+
AMI: 'ami-0e166015f8dee9d71'
217217
'ap-southeast-3':
218-
AMI: 'ami-0c6c6c37ace590ed8'
218+
AMI: 'ami-0f8159cc3ab5fffaf'
219219
'ap-southeast-4':
220-
AMI: 'ami-0fb1709904e070832'
220+
AMI: 'ami-04864bb4b01bd8038'
221221
'us-east-1':
222-
AMI: 'ami-098143f68772b34f5'
222+
AMI: 'ami-0d887a308369b6881'
223223
'us-east-2':
224-
AMI: 'ami-0dbb0f9887f1fe98f'
224+
AMI: 'ami-0e534f3e5321ed9ed'
225225
Conditions:
226226
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
227227
HasKeyName: !Not [!Equals [!Ref KeyName, '']]

‎security/auth-proxy-ha-github-orga.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -145,61 +145,61 @@ Parameters:
145145
Mappings:
146146
RegionMap:
147147
'ap-south-2':
148-
AMI: 'ami-036d87c4b5e557058'
148+
AMI: 'ami-09ec6c49d26d0518f'
149149
'ap-south-1':
150-
AMI: 'ami-0579bae099b504874'
150+
AMI: 'ami-020562d2cd769c81b'
151151
'eu-south-1':
152-
AMI: 'ami-0a914332da537e79d'
152+
AMI: 'ami-08a273089ab10bfda'
153153
'eu-south-2':
154-
AMI: 'ami-0a7d1ec93ac8b262d'
154+
AMI: 'ami-0295ec06d7ecf07a2'
155155
'me-central-1':
156-
AMI: 'ami-02c1c88c0a7d21a6c'
156+
AMI: 'ami-0911d5289b0ceaafa'
157157
'il-central-1':
158-
AMI: 'ami-080e21a9661f94810'
158+
AMI: 'ami-0f552ebe7c7bc7655'
159159
'ca-central-1':
160-
AMI: 'ami-0634933bd8c9f5e98'
160+
AMI: 'ami-09fa72aa5ea159b61'
161161
'eu-central-1':
162-
AMI: 'ami-0a2a6a10b645a609e'
162+
AMI: 'ami-0d2820455d08be628'
163163
'eu-central-2':
164-
AMI: 'ami-0b6afc5be59d1af43'
164+
AMI: 'ami-0a37533ef40d2f340'
165165
'us-west-1':
166-
AMI: 'ami-0f56d8f4fdaf39279'
166+
AMI: 'ami-01cff12e087f492c6'
167167
'us-west-2':
168-
AMI: 'ami-00755a52896316cee'
168+
AMI: 'ami-0044a0897b53acfb6'
169169
'af-south-1':
170-
AMI: 'ami-02897988d6a298cc8'
170+
AMI: 'ami-0e0da87fdaf927717'
171171
'eu-north-1':
172-
AMI: 'ami-0d4f49135e57daf78'
172+
AMI: 'ami-0312b506c46eb9f64'
173173
'eu-west-3':
174-
AMI: 'ami-06509bffd4252cf89'
174+
AMI: 'ami-05d9ff5247ae93752'
175175
'eu-west-2':
176-
AMI: 'ami-0fc7663ee27a52476'
176+
AMI: 'ami-0db2efede9f8bb581'
177177
'eu-west-1':
178-
AMI: 'ami-0aa6a4d042e0ccc31'
178+
AMI: 'ami-052b48dff01bd3a2d'
179179
'ap-northeast-3':
180-
AMI: 'ami-09de0771d3499d835'
180+
AMI: 'ami-07795c2951dc11ce7'
181181
'ap-northeast-2':
182-
AMI: 'ami-0ec77cfb1037681eb'
182+
AMI: 'ami-085a10255c2ecb4cb'
183183
'me-south-1':
184-
AMI: 'ami-0dd2efcb1350d662f'
184+
AMI: 'ami-0a6e54be87919a76a'
185185
'ap-northeast-1':
186-
AMI: 'ami-0baf2b5b1e0cfaeab'
186+
AMI: 'ami-0e3ceefc9a200a838'
187187
'sa-east-1':
188-
AMI: 'ami-018cded4e74aec9cd'
188+
AMI: 'ami-0df03a6401e7a2943'
189189
'ap-east-1':
190-
AMI: 'ami-01192e69f89fca9e6'
190+
AMI: 'ami-05676b11acc4161d5'
191191
'ap-southeast-1':
192-
AMI: 'ami-080367f396ea04ea7'
192+
AMI: 'ami-044d69b8549e33ff1'
193193
'ap-southeast-2':
194-
AMI: 'ami-046a52b150aed081a'
194+
AMI: 'ami-0e166015f8dee9d71'
195195
'ap-southeast-3':
196-
AMI: 'ami-0c6c6c37ace590ed8'
196+
AMI: 'ami-0f8159cc3ab5fffaf'
197197
'ap-southeast-4':
198-
AMI: 'ami-0fb1709904e070832'
198+
AMI: 'ami-04864bb4b01bd8038'
199199
'us-east-1':
200-
AMI: 'ami-098143f68772b34f5'
200+
AMI: 'ami-0d887a308369b6881'
201201
'us-east-2':
202-
AMI: 'ami-0dbb0f9887f1fe98f'
202+
AMI: 'ami-0e534f3e5321ed9ed'
203203
Conditions:
204204
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
205205
HasKeyName: !Not [!Equals [!Ref KeyName, '']]

‎vpc/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output
1414

1515
#### NATAMI
1616
```
17-
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
17+
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
1818
```

‎vpc/vpc-nat-instance.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -99,61 +99,61 @@ Parameters:
9999
Mappings:
100100
RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well)
101101
'ap-south-2':
102-
NATAMI: 'ami-0a47d51f54aed7a49'
102+
NATAMI: 'ami-04db8228134fd0348'
103103
'ap-south-1':
104-
NATAMI: 'ami-0eef2c12d70c76b97'
104+
NATAMI: 'ami-0d72bc3916f5c4e3f'
105105
'eu-south-1':
106-
NATAMI: 'ami-0db9220609690f2cd'
106+
NATAMI: 'ami-0adaf366ed21f6ac8'
107107
'eu-south-2':
108-
NATAMI: 'ami-082dadac4a0a62bed'
108+
NATAMI: 'ami-06f8fd0e3e03f7ca8'
109109
'me-central-1':
110-
NATAMI: 'ami-0b80869f8cb20bf27'
110+
NATAMI: 'ami-0f841582f68e4fcab'
111111
'il-central-1':
112-
NATAMI: 'ami-00ac640e0bbd88b97'
112+
NATAMI: 'ami-0500414f74bc50e82'
113113
'ca-central-1':
114-
NATAMI: 'ami-0eb22c6acc2d3a41f'
114+
NATAMI: 'ami-0456bc7879504f482'
115115
'eu-central-1':
116-
NATAMI: 'ami-07bb13258263bb380'
116+
NATAMI: 'ami-01c795b4aaad2268e'
117117
'eu-central-2':
118-
NATAMI: 'ami-081c5ae8bcd975855'
118+
NATAMI: 'ami-0665919480e8eebcb'
119119
'us-west-1':
120-
NATAMI: 'ami-05d6fa0984b006be0'
120+
NATAMI: 'ami-0158169a186af8bbf'
121121
'us-west-2':
122-
NATAMI: 'ami-02e27c1df3363190c'
122+
NATAMI: 'ami-0b9cc2113befaffc1'
123123
'af-south-1':
124-
NATAMI: 'ami-0586c3a539b42a0c2'
124+
NATAMI: 'ami-0876eec8f285e3933'
125125
'eu-north-1':
126-
NATAMI: 'ami-06a23e214aa407709'
126+
NATAMI: 'ami-085ee0efe52e19839'
127127
'eu-west-3':
128-
NATAMI: 'ami-0c3ff1dba5ce65f6e'
128+
NATAMI: 'ami-0504ef8af95ce635f'
129129
'eu-west-2':
130-
NATAMI: 'ami-02719b84cb731adfa'
130+
NATAMI: 'ami-0c04b9cc71427721a'
131131
'eu-west-1':
132-
NATAMI: 'ami-07671e7f5ef0236fd'
132+
NATAMI: 'ami-015b58193d83be259'
133133
'ap-northeast-3':
134-
NATAMI: 'ami-075c1a7be90c2e3df'
134+
NATAMI: 'ami-0abdd26c798aa8ae6'
135135
'ap-northeast-2':
136-
NATAMI: 'ami-08e0e136dde5ca493'
136+
NATAMI: 'ami-035bd0fed9c9525f6'
137137
'me-south-1':
138-
NATAMI: 'ami-067dc4eba0789f8d9'
138+
NATAMI: 'ami-0e770cc1fa3703fdb'
139139
'ap-northeast-1':
140-
NATAMI: 'ami-08db1d9f871874c24'
140+
NATAMI: 'ami-077a0e989c1c14707'
141141
'sa-east-1':
142-
NATAMI: 'ami-0036678a6278e7f40'
142+
NATAMI: 'ami-00eacee1c13aaa1c7'
143143
'ap-east-1':
144-
NATAMI: 'ami-07195cfd35a11d34a'
144+
NATAMI: 'ami-01ddafdcfa3ead4ab'
145145
'ap-southeast-1':
146-
NATAMI: 'ami-0d1fabdaa9ee67284'
146+
NATAMI: 'ami-04c35b4deb7ed561d'
147147
'ap-southeast-2':
148-
NATAMI: 'ami-068028aa95d8d44b3'
148+
NATAMI: 'ami-06dafb7ec372d31ee'
149149
'ap-southeast-3':
150-
NATAMI: 'ami-053c7a4adb0e79144'
150+
NATAMI: 'ami-01cd9f8a3f5cbb952'
151151
'ap-southeast-4':
152-
NATAMI: 'ami-05b9950ab3407ed5f'
152+
NATAMI: 'ami-0dcfb60e1007b8017'
153153
'us-east-1':
154-
NATAMI: 'ami-0c40e34cc38756ad4'
154+
NATAMI: 'ami-0c6dac030329381b4'
155155
'us-east-2':
156-
NATAMI: 'ami-079c4ed8a2b051ea3'
156+
NATAMI: 'ami-0e7cc90bc399ce3d4'
157157
Conditions:
158158
HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
159159
HasKeyName: !Not [!Equals [!Ref KeyName, '']]

0 commit comments

Comments
 (0)