Merge ~toabctl/cloud-images/+git/aws-eks-website:drop-1.15 into ~cloud-images-release-managers/cloud-images/+git/aws-eks-website:master
- Git
- lp:~toabctl/cloud-images/+git/aws-eks-website
- drop-1.15
- Merge into master
Proposed by
Thomas Bechtold
Status: | Merged |
---|---|
Merged at revision: | d440326039e4f5d7440f8d511eced08130b58f76 |
Proposed branch: | ~toabctl/cloud-images/+git/aws-eks-website:drop-1.15 |
Merge into: | ~cloud-images-release-managers/cloud-images/+git/aws-eks-website:master |
Diff against target: |
453 lines (+10/-409) 1 file modified
index.html (+10/-409) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Philip Roche | Approve | ||
Joshua Powers (community) | Approve | ||
Review via email: mp+402821@code.launchpad.net |
Commit message
1.15: remove EOL release from page
1.15 is EOL[0]. Drop it.
[0]
https:/
Description of the change
To post a comment you must log in.
Revision history for this message
Joshua Powers (powersj) : | # |
review:
Approve
Revision history for this message
Philip Roche (philroche) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/index.html b/index.html |
2 | index c2c3c43..96fab11 100644 |
3 | --- a/index.html |
4 | +++ b/index.html |
5 | @@ -175,13 +175,10 @@ |
6 | </h3> |
7 | <dl class="p-card__content"> |
8 | <dt> |
9 | - 20210426 |
10 | + 20210517 |
11 | </dt> |
12 | <dd> |
13 | - Add 1.15, 1.16 and 1.17 platform amis with serial 20210426. This includes a fix when Metadata version is set to V2 only (token required). See |
14 | - <a href="https://bugs.launchpad.net/cloud-images/+bug/1925487"> |
15 | - LP:#1925487 |
16 | - </a> |
17 | + EKS 1.15 is now EOL, removed images from page |
18 | </dd> |
19 | </dl> |
20 | <div aria-multiselect="true" class="p-accordion" role="tablist"> |
21 | @@ -193,7 +190,14 @@ |
22 | </i> |
23 | </button> |
24 | <section aria-hidden="true" aria-labelledby="tab1-section" class="p-accordion__panel" id="tab1-section" role="tabpanel"> |
25 | - <dl> |
26 | + <dl> |
27 | + <dt> |
28 | + 20210426 |
29 | + </dt> |
30 | + <dd> |
31 | + Add 1.15, 1.16 and 1.17 platform amis with serial 20210426. This includes a fix when Metadata version is set to V2 only (token required). See |
32 | + <a href="https://bugs.launchpad.net/cloud-images/+bug/1925487">LP:#1925487</a> |
33 | + </dd> |
34 | <dt> |
35 | 20210423 |
36 | </dt> |
37 | @@ -293,9 +297,6 @@ |
38 | <li aria-controls="#kubernetes-1-16" aria-selected="false" class="p-inline-list__item p-tab-selector" id="tab4" role="tab"> |
39 | 1.16 |
40 | </li> |
41 | - <li aria-controls="#kubernetes-1-15" aria-selected="false" class="p-inline-list__item p-tab-selector" id="tab5" role="tab"> |
42 | - 1.15 |
43 | - </li> |
44 | </ul> |
45 | </h3> |
46 | </div> |
47 | @@ -1901,406 +1902,6 @@ |
48 | </div> |
49 | </section> |
50 | </div> |
51 | - <div aria-hidden="true" aria-labelledby="tab5" class="p-tab" id="kubernetes-1-15" role="tabpanel"> |
52 | - <section class="p-strip--light is-shallow"> |
53 | - <div class="row"> |
54 | - <div class="col-12"> |
55 | - <p class="p-heading--five"> |
56 | - Date: |
57 | - </p> |
58 | - <table> |
59 | - <thead> |
60 | - <tr> |
61 | - <th> |
62 | - Region |
63 | - </th> |
64 | - <th> |
65 | - Use this or later image |
66 | - </th> |
67 | - </tr> |
68 | - </thead> |
69 | - <tbody> |
70 | - <tr> |
71 | - <td> |
72 | - Asia Pacific (Hong Kong) (ap-east-1) |
73 | - </td> |
74 | - <td> |
75 | - <div class="p-code-copyable"> |
76 | - <a href="https://ap-east-1.console.aws.amazon.com/ec2/v2/home?region=ap-east-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
77 | - ami-0f75d71f85e16bd25 |
78 | - </a> |
79 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0f75d71f85e16bd25"/> |
80 | - <button class="p-code-copyable__action"> |
81 | - Copy to clipboard |
82 | - </button> |
83 | - </div> |
84 | - </td> |
85 | - </tr> |
86 | - <tr> |
87 | - <td> |
88 | - Asia Pacific (Tokyo) (ap-northeast-1) |
89 | - </td> |
90 | - <td> |
91 | - <div class="p-code-copyable"> |
92 | - <a href="https://ap-northeast-1.console.aws.amazon.com/ec2/v2/home?region=ap-northeast-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
93 | - ami-018738a988de55f7d |
94 | - </a> |
95 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-018738a988de55f7d"/> |
96 | - <button class="p-code-copyable__action"> |
97 | - Copy to clipboard |
98 | - </button> |
99 | - </div> |
100 | - </td> |
101 | - </tr> |
102 | - <tr> |
103 | - <td> |
104 | - Asia Pacific (Seoul) (ap-northeast-2) |
105 | - </td> |
106 | - <td> |
107 | - <div class="p-code-copyable"> |
108 | - <a href="https://ap-northeast-2.console.aws.amazon.com/ec2/v2/home?region=ap-northeast-2#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
109 | - ami-0f82db4c5190c249c |
110 | - </a> |
111 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0f82db4c5190c249c"/> |
112 | - <button class="p-code-copyable__action"> |
113 | - Copy to clipboard |
114 | - </button> |
115 | - </div> |
116 | - </td> |
117 | - </tr> |
118 | - <tr> |
119 | - <td> |
120 | - Asia Pacific (Osaka-Local) (ap-northeast-3) |
121 | - </td> |
122 | - <td> |
123 | - <div class="p-code-copyable"> |
124 | - <a href="https://ap-northeast-3.console.aws.amazon.com/ec2/v2/home?region=ap-northeast-3#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
125 | - ami-0c2d1c64a900c8e48 |
126 | - </a> |
127 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0c2d1c64a900c8e48"/> |
128 | - <button class="p-code-copyable__action"> |
129 | - Copy to clipboard |
130 | - </button> |
131 | - </div> |
132 | - </td> |
133 | - </tr> |
134 | - <tr> |
135 | - <td> |
136 | - Asia Pacific (Mumbai) (ap-south-1) |
137 | - </td> |
138 | - <td> |
139 | - <div class="p-code-copyable"> |
140 | - <a href="https://ap-south-1.console.aws.amazon.com/ec2/v2/home?region=ap-south-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
141 | - ami-0a39de580087a5ccc |
142 | - </a> |
143 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0a39de580087a5ccc"/> |
144 | - <button class="p-code-copyable__action"> |
145 | - Copy to clipboard |
146 | - </button> |
147 | - </div> |
148 | - </td> |
149 | - </tr> |
150 | - <tr> |
151 | - <td> |
152 | - Asia Pacific (Singapore) (ap-southeast-1) |
153 | - </td> |
154 | - <td> |
155 | - <div class="p-code-copyable"> |
156 | - <a href="https://ap-southeast-1.console.aws.amazon.com/ec2/v2/home?region=ap-southeast-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
157 | - ami-06102a214672cc0c8 |
158 | - </a> |
159 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-06102a214672cc0c8"/> |
160 | - <button class="p-code-copyable__action"> |
161 | - Copy to clipboard |
162 | - </button> |
163 | - </div> |
164 | - </td> |
165 | - </tr> |
166 | - <tr> |
167 | - <td> |
168 | - Asia Pacific (Sydney) (ap-southeast-2) |
169 | - </td> |
170 | - <td> |
171 | - <div class="p-code-copyable"> |
172 | - <a href="https://ap-southeast-2.console.aws.amazon.com/ec2/v2/home?region=ap-southeast-2#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
173 | - ami-00a62f578c4552245 |
174 | - </a> |
175 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-00a62f578c4552245"/> |
176 | - <button class="p-code-copyable__action"> |
177 | - Copy to clipboard |
178 | - </button> |
179 | - </div> |
180 | - </td> |
181 | - </tr> |
182 | - <tr> |
183 | - <td> |
184 | - Africa (Capetown) (af-south-1) |
185 | - </td> |
186 | - <td> |
187 | - <div class="p-code-copyable"> |
188 | - <a href="https://af-south-1.console.aws.amazon.com/ec2/v2/home?region=af-south-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
189 | - ami-0a382d055c2214587 |
190 | - </a> |
191 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0a382d055c2214587"/> |
192 | - <button class="p-code-copyable__action"> |
193 | - Copy to clipboard |
194 | - </button> |
195 | - </div> |
196 | - </td> |
197 | - </tr> |
198 | - <tr> |
199 | - <td> |
200 | - Canada (Central) (ca-central-1) |
201 | - </td> |
202 | - <td> |
203 | - <div class="p-code-copyable"> |
204 | - <a href="https://ca-central-1.console.aws.amazon.com/ec2/v2/home?region=ca-central-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
205 | - ami-0a34fb065953108e4 |
206 | - </a> |
207 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0a34fb065953108e4"/> |
208 | - <button class="p-code-copyable__action"> |
209 | - Copy to clipboard |
210 | - </button> |
211 | - </div> |
212 | - </td> |
213 | - </tr> |
214 | - <tr> |
215 | - <td> |
216 | - EU (Frankfurt) (eu-central-1) |
217 | - </td> |
218 | - <td> |
219 | - <div class="p-code-copyable"> |
220 | - <a href="https://eu-central-1.console.aws.amazon.com/ec2/v2/home?region=eu-central-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
221 | - ami-0efbdd40b78f97526 |
222 | - </a> |
223 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0efbdd40b78f97526"/> |
224 | - <button class="p-code-copyable__action"> |
225 | - Copy to clipboard |
226 | - </button> |
227 | - </div> |
228 | - </td> |
229 | - </tr> |
230 | - <tr> |
231 | - <td> |
232 | - EU (Stockholm) (eu-north-1) |
233 | - </td> |
234 | - <td> |
235 | - <div class="p-code-copyable"> |
236 | - <a href="https://eu-north-1.console.aws.amazon.com/ec2/v2/home?region=eu-north-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
237 | - ami-0c36dced42879d1e4 |
238 | - </a> |
239 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0c36dced42879d1e4"/> |
240 | - <button class="p-code-copyable__action"> |
241 | - Copy to clipboard |
242 | - </button> |
243 | - </div> |
244 | - </td> |
245 | - </tr> |
246 | - <tr> |
247 | - <td> |
248 | - EU (Ireland) (eu-west-1) |
249 | - </td> |
250 | - <td> |
251 | - <div class="p-code-copyable"> |
252 | - <a href="https://eu-west-1.console.aws.amazon.com/ec2/v2/home?region=eu-west-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
253 | - ami-0b9798b7da145bd27 |
254 | - </a> |
255 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0b9798b7da145bd27"/> |
256 | - <button class="p-code-copyable__action"> |
257 | - Copy to clipboard |
258 | - </button> |
259 | - </div> |
260 | - </td> |
261 | - </tr> |
262 | - <tr> |
263 | - <td> |
264 | - EU (London) (eu-west-2) |
265 | - </td> |
266 | - <td> |
267 | - <div class="p-code-copyable"> |
268 | - <a href="https://eu-west-2.console.aws.amazon.com/ec2/v2/home?region=eu-west-2#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
269 | - ami-06bdbc9677f425e1c |
270 | - </a> |
271 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-06bdbc9677f425e1c"/> |
272 | - <button class="p-code-copyable__action"> |
273 | - Copy to clipboard |
274 | - </button> |
275 | - </div> |
276 | - </td> |
277 | - </tr> |
278 | - <tr> |
279 | - <td> |
280 | - EU (Paris) (eu-west-3) |
281 | - </td> |
282 | - <td> |
283 | - <div class="p-code-copyable"> |
284 | - <a href="https://eu-west-3.console.aws.amazon.com/ec2/v2/home?region=eu-west-3#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
285 | - ami-0ce3bedd43c6a84a4 |
286 | - </a> |
287 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0ce3bedd43c6a84a4"/> |
288 | - <button class="p-code-copyable__action"> |
289 | - Copy to clipboard |
290 | - </button> |
291 | - </div> |
292 | - </td> |
293 | - </tr> |
294 | - <tr> |
295 | - <td> |
296 | - EU (Milan) (eu-south-1) |
297 | - </td> |
298 | - <td> |
299 | - <div class="p-code-copyable"> |
300 | - <a href="https://eu-south-1.console.aws.amazon.com/ec2/v2/home?region=eu-south-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
301 | - ami-0f0885fd19e7370b6 |
302 | - </a> |
303 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0f0885fd19e7370b6"/> |
304 | - <button class="p-code-copyable__action"> |
305 | - Copy to clipboard |
306 | - </button> |
307 | - </div> |
308 | - </td> |
309 | - </tr> |
310 | - <tr> |
311 | - <td> |
312 | - Middle East (Bahrain) (me-south-1) |
313 | - </td> |
314 | - <td> |
315 | - <div class="p-code-copyable"> |
316 | - <a href="https://me-south-1.console.aws.amazon.com/ec2/v2/home?region=me-south-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
317 | - ami-0e8b69a0529c947a5 |
318 | - </a> |
319 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0e8b69a0529c947a5"/> |
320 | - <button class="p-code-copyable__action"> |
321 | - Copy to clipboard |
322 | - </button> |
323 | - </div> |
324 | - </td> |
325 | - </tr> |
326 | - <tr> |
327 | - <td> |
328 | - South America (São Paulo) (sa-east-1) |
329 | - </td> |
330 | - <td> |
331 | - <div class="p-code-copyable"> |
332 | - <a href="https://sa-east-1.console.aws.amazon.com/ec2/v2/home?region=sa-east-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
333 | - ami-0486263224869dd03 |
334 | - </a> |
335 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0486263224869dd03"/> |
336 | - <button class="p-code-copyable__action"> |
337 | - Copy to clipboard |
338 | - </button> |
339 | - </div> |
340 | - </td> |
341 | - </tr> |
342 | - <tr> |
343 | - <td> |
344 | - US East (Virginia) (us-east-1) |
345 | - </td> |
346 | - <td> |
347 | - <div class="p-code-copyable"> |
348 | - <a href="https://us-east-1.console.aws.amazon.com/ec2/v2/home?region=us-east-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
349 | - ami-08353a85732530ce9 |
350 | - </a> |
351 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-08353a85732530ce9"/> |
352 | - <button class="p-code-copyable__action"> |
353 | - Copy to clipboard |
354 | - </button> |
355 | - </div> |
356 | - </td> |
357 | - </tr> |
358 | - <tr> |
359 | - <td> |
360 | - US East (Ohio) (us-east-2) |
361 | - </td> |
362 | - <td> |
363 | - <div class="p-code-copyable"> |
364 | - <a href="https://us-east-2.console.aws.amazon.com/ec2/v2/home?region=us-east-2#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
365 | - ami-00758f32271cbdb25 |
366 | - </a> |
367 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-00758f32271cbdb25"/> |
368 | - <button class="p-code-copyable__action"> |
369 | - Copy to clipboard |
370 | - </button> |
371 | - </div> |
372 | - </td> |
373 | - </tr> |
374 | - <tr> |
375 | - <td> |
376 | - US West (N. California) (us-west-1) |
377 | - </td> |
378 | - <td> |
379 | - <div class="p-code-copyable"> |
380 | - <a href="https://us-west-1.console.aws.amazon.com/ec2/v2/home?region=us-west-1#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
381 | - ami-0c3fcf960d15ac6f5 |
382 | - </a> |
383 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0c3fcf960d15ac6f5"/> |
384 | - <button class="p-code-copyable__action"> |
385 | - Copy to clipboard |
386 | - </button> |
387 | - </div> |
388 | - </td> |
389 | - </tr> |
390 | - <tr> |
391 | - <td> |
392 | - US West (Oregon) (us-west-2) |
393 | - </td> |
394 | - <td> |
395 | - <div class="p-code-copyable"> |
396 | - <a href="https://us-west-2.console.aws.amazon.com/ec2/v2/home?region=us-west-2#Images:visibility=public-images;name=ubuntu-eks/k8s_1.15/images/*;ownerAlias=099720109477;sort=desc:name"> |
397 | - ami-0ba918b8809f8d365 |
398 | - </a> |
399 | - <input class="p-code-copyable__input" hidden="" readonly="readonly" value="ami-0ba918b8809f8d365"/> |
400 | - <button class="p-code-copyable__action"> |
401 | - Copy to clipboard |
402 | - </button> |
403 | - </div> |
404 | - </td> |
405 | - </tr> |
406 | - </tbody> |
407 | - </table> |
408 | - </div> |
409 | - </div> |
410 | - </section> |
411 | - <section class="p-strip--light is-bordered is-shallow"> |
412 | - <div class="row"> |
413 | - <div class="col-12"> |
414 | - <h3 class="p-card__title"> |
415 | - Kubernetes 1.15 |
416 | - </h3> |
417 | - <p> |
418 | - The latest Ubuntu worker node AMIs for Kubernetes 1.15 (N.B. EKS may not be available in some of these regions, check the |
419 | - <a href="https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services/"> |
420 | - list of current EKS regions |
421 | - </a> |
422 | - ): |
423 | - </p> |
424 | - <p> |
425 | - <b> |
426 | - Important: |
427 | - </b> |
428 | - EKS images that support Kubernetes 1.15 use the default |
429 | - <a href="https://amazon-eks.s3-us-west-2.amazonaws.com/cloudformation/2019-10-08/amazon-eks-nodegroup.yaml"> |
430 | - amazon-eks-nodegroup.yaml |
431 | - </a> |
432 | - , as specified in the |
433 | - <a href="https://docs.aws.amazon.com/eks/latest/userguide/getting-started-console.html"> |
434 | - AWS EKS Console Getting Started Guide |
435 | - </a> |
436 | - . To use Ubuntu EKS images with the nodegroup template in |
437 | - Step 3: Launch and Configure Amazon EKS Worker Nodes, click the |
438 | - 'Launch Workers' link for your your region and Kubernetes release |
439 | - version, and enter the Ubuntu AMI ID for your region, listed on this |
440 | - page, into the field labeled 'NodeImageId'. |
441 | - </p> |
442 | - <p> |
443 | - <small> |
444 | - This image is customized specifically for the EKS service and is not intended as a general OS image. |
445 | - </small> |
446 | - </p> |
447 | - </div> |
448 | - </div> |
449 | - </section> |
450 | - </div> |
451 | </main> |
452 | <footer class="p-strip is-shallow"> |
453 | <div class="row"> |