Skip to content

Commit bb3cad0

Browse files
authored
feat(config/os): add ubuntu 26.04 (#2524)
1 parent 71ddc50 commit bb3cad0

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

config/os.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func GetEOL(family, release string) (eol EOL, found bool) {
143143
// Not found
144144
eol, found = map[string]EOL{}[major(release)]
145145
case constant.Ubuntu:
146-
// https://wiki.ubuntu.com/Releases
146+
// https://ubuntu.com/about/release-cycle
147147
eol, found = map[string]EOL{
148148
"6.06": {Ended: true},
149149
"6.10": {Ended: true},
@@ -219,6 +219,10 @@ func GetEOL(family, release string) (eol EOL, found bool) {
219219
"25.10": {
220220
StandardSupportUntil: time.Date(2026, 7, 31, 23, 59, 59, 0, time.UTC),
221221
},
222+
"26.04": {
223+
StandardSupportUntil: time.Date(2031, 5, 31, 23, 59, 59, 0, time.UTC),
224+
ExtendedSupportUntil: time.Date(2036, 4, 30, 23, 59, 59, 0, time.UTC),
225+
},
222226
}[release]
223227
case constant.OpenSUSE:
224228
// https://en.opensuse.org/Lifetime

config/os_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,22 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
443443
stdEnded: false,
444444
extEnded: false,
445445
},
446+
{
447+
name: "Ubuntu 26.04 supported",
448+
fields: fields{family: constant.Ubuntu, release: "26.04"},
449+
now: time.Date(2026, 4, 25, 23, 59, 59, 0, time.UTC),
450+
found: true,
451+
stdEnded: false,
452+
extEnded: false,
453+
},
454+
{
455+
name: "Ubuntu 26.04 ext supported",
456+
fields: fields{family: constant.Ubuntu, release: "26.04"},
457+
now: time.Date(2032, 1, 1, 0, 0, 0, 0, time.UTC),
458+
found: true,
459+
stdEnded: true,
460+
extEnded: false,
461+
},
446462
//Debian
447463
{
448464
name: "Debian 8 supported",

0 commit comments

Comments
 (0)