Skip to content

Commit 24a45b3

Browse files
authored
Merge pull request #18232 from upodroid/ubuntu-2604-support
Initial support for Ubuntu 26.04
2 parents 023db17 + d6cc1be commit 24a45b3

5 files changed

Lines changed: 46 additions & 2 deletions

File tree

docs/operations/images.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ The following table provides the support status for various distros with regards
6060
| [Ubuntu 20.04](#ubuntu-2004-focal) | 1.16.2 | 1.18 | - | - |
6161
| [Ubuntu 22.04](#ubuntu-2204-jammy) | 1.23 | 1.24 | - | - |
6262
| [Ubuntu 24.04](#ubuntu-2404-noble) | 1.29 | 1.31 | - | - |
63+
| [Ubuntu 26.04](#ubuntu-2604-resolute) | 1.36 | - | - | - |
6364
6465
## Supported Distros
6566
@@ -332,7 +333,7 @@ aws ec2 describe-images --region us-east-1 --output table \
332333
--filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-*"
333334

334335
# Google Cloud Platform (GCP)
335-
gcloud compute images list --filter ubuntu-2204-jammy-v \
336+
gcloud compute images list --filter ubuntu-2204-jammy \
336337
--project ubuntu-os-cloud
337338

338339
# Microsoft Azure
@@ -354,14 +355,36 @@ aws ec2 describe-images --region us-east-1 --output table \
354355
--filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-*"
355356

356357
# Google Cloud Platform (GCP)
357-
gcloud compute images list --filter ubuntu-2204-jammy-v \
358+
gcloud compute images list --filter ubuntu-2404-noble \
358359
--project ubuntu-os-cloud
359360

360361
# Microsoft Azure
361362
az vm image list --all --output table \
362363
--publisher Canonical --offer 0001-com-ubuntu-server-jammy --sku 22_04-lts-gen2
363364
```
364365

366+
### Ubuntu 26.04 (Resolute)
367+
368+
Support for Ubuntu 26.04 is based on Kernel version **7.0**.
369+
370+
Available images can be listed using:
371+
372+
```bash
373+
# Amazon Web Services (AWS)
374+
aws ec2 describe-images --region us-east-1 --output table \
375+
--owners 099720109477 \
376+
--query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \
377+
--filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-*-*"
378+
379+
# Google Cloud Platform (GCP)
380+
gcloud compute images list --filter ubuntu-2604-resolute-v \
381+
--project ubuntu-os-cloud
382+
383+
# Microsoft Azure
384+
az vm image list --all --output table \
385+
--publisher Canonical --offer 0001-com-ubuntu-server-resolute --sku 26_04-lts-gen2
386+
```
387+
365388
## Owner aliases
366389

367390
kOps supports owner aliases for the official accounts of supported distros:

util/pkg/distributions/distributions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ var (
4949
DistributionUbuntu2204 = Distribution{packageFormat: "deb", project: "ubuntu", id: "jammy", version: 22.04}
5050
DistributionUbuntu2404 = Distribution{packageFormat: "deb", project: "ubuntu", id: "noble", version: 24.04}
5151
DistributionUbuntu2510 = Distribution{packageFormat: "deb", project: "ubuntu", id: "questing", version: 25.10}
52+
DistributionUbuntu2604 = Distribution{packageFormat: "deb", project: "ubuntu", id: "resolute", version: 26.04}
5253

5354
// Redhat-family distros
5455
DistributionRhel8 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel8", version: 8}

util/pkg/distributions/identify.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ func FindDistribution(rootfs string) (Distribution, error) {
7474
return DistributionUbuntu2404, nil
7575
case "ubuntu-25.10":
7676
return DistributionUbuntu2510, nil
77+
case "ubuntu-26.04":
78+
return DistributionUbuntu2604, nil
7779
}
7880

7981
// Some distros have a more verbose VERSION_ID

util/pkg/distributions/identify_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ func TestFindDistribution(t *testing.T) {
138138
err: nil,
139139
expected: DistributionUbuntu2510,
140140
},
141+
{
142+
rootfs: "ubuntu2604",
143+
err: nil,
144+
expected: DistributionUbuntu2604,
145+
},
141146
{
142147
rootfs: "notfound",
143148
err: fmt.Errorf("reading /etc/os-release: open tests/notfound/etc/os-release: no such file or directory"),
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
PRETTY_NAME="Ubuntu 26.04 LTS"
2+
NAME="Ubuntu"
3+
VERSION_ID="26.04"
4+
VERSION="26.04 (Resolute Raccoon)"
5+
VERSION_CODENAME=resolute
6+
ID=ubuntu
7+
ID_LIKE=debian
8+
HOME_URL="https://www.ubuntu.com/"
9+
SUPPORT_URL="https://help.ubuntu.com/"
10+
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
11+
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
12+
UBUNTU_CODENAME=resolute
13+
LOGO=ubuntu-logo

0 commit comments

Comments
 (0)