From fea929f9901a643c7a2b89dd5e3382d961b56819 Mon Sep 17 00:00:00 2001
From: BG <bguttmann@anynines.com>
Date: Tue, 9 Jun 2026 09:58:05 +0200
Subject: [PATCH] Cleanup Bionic Reference in the Docs

---
 templates/stemcells/_bionic_notice.tmpl |  4 ----
 templates/stemcells/all.tmpl            |  4 ----
 templates/stemcells/single.tmpl         |  3 ---
 ui/stemcell/all_distros.go              | 15 +--------------
 4 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 templates/stemcells/_bionic_notice.tmpl

diff --git a/templates/stemcells/_bionic_notice.tmpl b/templates/stemcells/_bionic_notice.tmpl
deleted file mode 100644
index f04d6a5e..00000000
--- a/templates/stemcells/_bionic_notice.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="admonition warning">
-  <p class="admonition-title">Deprecation Warning</p>
-  <p>Stemcells based on Ubuntu Bionic (18.04) are no longer receiving security updates from Open Source Cloud Foundry due to the End of Standard Support. We strongly recommend switching to Ubuntu Jammy (22.04) based stemcells.</p>
-</div>
diff --git a/templates/stemcells/all.tmpl b/templates/stemcells/all.tmpl
index dde9d76d..30d2df06 100644
--- a/templates/stemcells/all.tmpl
+++ b/templates/stemcells/all.tmpl
@@ -11,7 +11,6 @@
               <li class="md-nav__item">
                 <a href="#ubuntu-noble" title="Ubuntu Noble" class="md-nav__link">Ubuntu Noble</a>
                 <a href="#ubuntu-jammy" title="Ubuntu Jammy" class="md-nav__link">Ubuntu Jammy</a>
-                <a href="#ubuntu-bionic" title="Ubuntu Bionic" class="md-nav__link">Ubuntu Bionic</a>
                 <a href="#windows2019" title="Windows 2019" class="md-nav__link">Windows 2019</a>
               </li>
             </ul>
@@ -29,9 +28,6 @@
           <h2 id="{{ .Distro.NameName }}">{{ .Distro.Name }}<a class="headerlink" href="#{{ .Distro.NameName }}" title="Permanent link">&para;</a></h2>
 
           {{ $osVersion := ( index .Distro.OSMatches 0 ).OSVersion }}
-          {{ if (eq $osVersion "bionic") }}
-            {{ template "stemcells/_bionic_notice" . }}
-          {{ end }}
           {{ if (eq $osVersion "jammy") }}
             {{ template "stemcells/_jammy_notice" . }}
           {{ end }}
diff --git a/templates/stemcells/single.tmpl b/templates/stemcells/single.tmpl
index 58221622..3ac83459 100644
--- a/templates/stemcells/single.tmpl
+++ b/templates/stemcells/single.tmpl
@@ -7,9 +7,6 @@
       <article class="md-content__inner md-typeset">
         <h1>{{ .Filter.Name }}</h1>
 
-          {{ if (eq $s.OSVersion "bionic") }}
-            {{ template "stemcells/_bionic_notice" . }}
-          {{ end }}
           {{ if (eq $s.OSVersion "jammy") }}
             {{ template "stemcells/_jammy_notice" . }}
           {{ end }}
diff --git a/ui/stemcell/all_distros.go b/ui/stemcell/all_distros.go
index 9d64c0b9..65818522 100644
--- a/ui/stemcell/all_distros.go
+++ b/ui/stemcell/all_distros.go
@@ -26,18 +26,6 @@ var (
 
 		Sort: 2,
 	}
-	ubuntuBionicDistro = Distro{
-		NameName: "ubuntu-bionic",
-		Name:     "Ubuntu Bionic",
-
-		OSMatches: []StemcellOSMatch{
-			{OSName: "ubuntu", OSVersion: "bionic"},
-		},
-
-		SupportedInfrastructures: allInfrastructures,
-
-		Sort: 3,
-	}
 	windows2019Distro = Distro{
 		NameName: "windows2019",
 		Name:     "Windows 2019",
@@ -52,7 +40,7 @@ var (
 			azureInfrastructure,
 		},
 
-		Sort: 4,
+		Sort: 3,
 	}
 )
 
@@ -60,7 +48,6 @@ var (
 	allDistros = []Distro{
 		ubuntuNobleDistro,
 		ubuntuJammyDistro,
-		ubuntuBionicDistro,
 		windows2019Distro,
 	}
 )