Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions templates/stemcells/_bionic_notice.tmpl

This file was deleted.

4 changes: 0 additions & 4 deletions templates/stemcells/all.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 }}
Expand Down
3 changes: 0 additions & 3 deletions templates/stemcells/single.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
15 changes: 1 addition & 14 deletions ui/stemcell/all_distros.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -52,15 +40,14 @@ var (
azureInfrastructure,
},

Sort: 4,
Sort: 3,
}
)

var (
allDistros = []Distro{
ubuntuNobleDistro,
ubuntuJammyDistro,
ubuntuBionicDistro,
windows2019Distro,
}
)