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 @@ -
-

Deprecation Warning

-

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.

-
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 @@
  • Ubuntu Noble Ubuntu Jammy - Ubuntu Bionic Windows 2019
  • @@ -29,9 +28,6 @@

    {{ .Distro.Name }}

    {{ $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 @@

    {{ .Filter.Name }}

    - {{ 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, } )