From 0c5cb27732e063137974ce94541b64d24f2db54b Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Tue, 1 Nov 2022 23:38:30 -0700
Subject: [PATCH] Deprecate Ubuntu 18.04

---
 docs/operations/images.md   | 30 ++++++++++++++----------------
 docs/releases/1.26-NOTES.md |  2 ++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/operations/images.md b/docs/operations/images.md
index b55811c881..948e1d5259 100644
--- a/docs/operations/images.md
+++ b/docs/operations/images.md
@@ -51,7 +51,7 @@ The following table provides the support status for various distros with regards
 | [RHEL 8](#rhel-8)                   |         1.15 |   1.18 |          - |       - |
 | [Rocky 8](#rocky-8)                 |       1.23.2 |   1.24 |          - |       - |
 | Ubuntu 16.04                        |          1.5 |   1.10 |       1.17 |    1.20 |
-| [Ubuntu 18.04](#ubuntu-1804-bionic) |         1.10 |   1.16 |          - |       - |
+| [Ubuntu 18.04](#ubuntu-1804-bionic) |         1.10 |   1.16 |       1.26 |       - |
 | [Ubuntu 20.04](#ubuntu-2004-focal)  |       1.16.2 |   1.18 |          - |       - |
 | [Ubuntu 22.04](#ubuntu-2204-jammy)  |         1.23 |   1.24 |          - |       - |
 
@@ -153,20 +153,6 @@ aws ec2 describe-images --region us-east-1 --output table \
   --filters "Name=name,Values=Rocky-8-ec2-8.*.x86_64"
 ```
 
-### Ubuntu 18.04 (Bionic)
-
-Ubuntu 18.04.5 is based on Kernel version **5.4** which fixes all the known major Kernel bugs.
-Earlier patch versions may still work, but are not recommended nor supported.
-
-Available images can be listed using:
-
-```bash
-aws ec2 describe-images --region us-east-1 --output table \
-  --owners 099720109477 \
-  --query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \
-  --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-*"
-```
-
 ### Ubuntu 20.04 (Focal)
 
 Ubuntu 20.04 is based on Kernel version **5.4** which fixes all the known major Kernel bugs.
@@ -195,7 +181,19 @@ aws ec2 describe-images --region us-east-1 --output table \
 
 ## Deprecated Distros
 
-There are currently no deprecated distros.
+### Ubuntu 18.04 (Bionic)
+
+Ubuntu 18.04.5 is based on Kernel version **5.4** which fixes all the known major Kernel bugs.
+Earlier patch versions may still work, but are not recommended nor supported.
+
+Available images can be listed using:
+
+```bash
+aws ec2 describe-images --region us-east-1 --output table \
+  --owners 099720109477 \
+  --query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \
+  --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-*"
+```
 
 ## Owner aliases
 
diff --git a/docs/releases/1.26-NOTES.md b/docs/releases/1.26-NOTES.md
index 3fd0659c87..cb4a0e7a40 100644
--- a/docs/releases/1.26-NOTES.md
+++ b/docs/releases/1.26-NOTES.md
@@ -21,6 +21,8 @@ This is a document to gather the release notes prior to the release.
 
 * Support for Kubernetes version 1.22 is deprecated and will be removed in kOps 1.28.
 
+* Support for Ubuntu 18.04 is deprecated and will be removed in kOps 1.28.
+
 * Support for AWS Classic Load Balancer for API is deprecated and should not be used for newly created clusters.