Sitelet https://github.com/kubernetes/kops/commit/004ad4be413256b5d7e2ab5c3a968e4874fce946
Skip to content

Commit 004ad4b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #18306 from rifelpet/automated-cherry-pick-of-#18232-origin-release-1.35
Automated cherry pick of #18232: Initial support for Ubuntu 26.04
2 parents df9d112 + bb7629d commit 004ad4b

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
@@ -347,7 +348,7 @@ aws ec2 describe-images --region us-east-1 --output table \
347348
--filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-*"
348349
349350
# Google Cloud Platform (GCP)
350-
gcloud compute images list --filter ubuntu-2204-jammy-v \
351+
gcloud compute images list --filter ubuntu-2204-jammy \
351352
--project ubuntu-os-cloud
352353
353354
# Microsoft Azure
@@ -369,14 +370,36 @@ aws ec2 describe-images --region us-east-1 --output table \
369370
--filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-*"
370371
371372
# Google Cloud Platform (GCP)
372-
gcloud compute images list --filter ubuntu-2204-jammy-v \
373+
gcloud compute images list --filter ubuntu-2404-noble \
373374
--project ubuntu-os-cloud
374375
375376
# Microsoft Azure
376377
az vm image list --all --output table \
377378
--publisher Canonical --offer 0001-com-ubuntu-server-jammy --sku 22_04-lts-gen2
378379
```
379380

381+
### Ubuntu 26.04 (Resolute)
382+
383+
Support for Ubuntu 26.04 is based on Kernel version **7.0**.
384+
385+
Available images can be listed using:
386+
387+
```bash
388+
# Amazon Web Services (AWS)
389+
aws ec2 describe-images --region us-east-1 --output table \
390+
--owners 099720109477 \
391+
--query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \
392+
--filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-*-*"
393+
394+
# Google Cloud Platform (GCP)
395+
gcloud compute images list --filter ubuntu-2604-resolute-v \
396+
--project ubuntu-os-cloud
397+
398+
# Microsoft Azure
399+
az vm image list --all --output table \
400+
--publisher Canonical --offer 0001-com-ubuntu-server-resolute --sku 26_04-lts-gen2
401+
```
402+
380403
## Owner aliases
381404

382405
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
@@ -76,6 +76,8 @@ func FindDistribution(rootfs string) (Distribution, error) {
7676
return DistributionUbuntu2404, nil
7777
case "ubuntu-25.10":
7878
return DistributionUbuntu2510, nil
79+
case "ubuntu-26.04":
80+
return DistributionUbuntu2604, nil
7981
}
8082

8183
// 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
@@ -143,6 +143,11 @@ func TestFindDistribution(t *testing.T) {
143143
err: nil,
144144
expected: DistributionUbuntu2510,
145145
},
146+
{
147+
rootfs: "ubuntu2604",
148+
err: nil,
149+
expected: DistributionUbuntu2604,
150+
},
146151
{
147152
rootfs: "notfound",
148153
err: fmt.Errorf("reading /etc/os-release: open tests/notfound/etc/os-release: no such file or directory"),

‎util/pkg/distributions/tests/ubuntu2604/etc/os-release‎

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)