Skip to content

Add Ubuntu 26.04 (Resolute) cloud images to channels #18239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ameukam wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −0
Draft

Add Ubuntu 26.04 (Resolute) cloud images to channels #18239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions channels/alpha
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ spec:
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.32.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.32.0"
kubernetesVersion: ">=1.32.0 <1.37.0"

- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-amd64-server-20260425
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.36.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.36.0"
kubernetesVersion: ">=1.37.0"

- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-arm64-server-20260425
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.36.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.36.0"
kubernetesVersion: ">=1.37.0"

- name: cos-cloud/cos-stable-65-10323-99-0
providerID: gce
architectureID: amd64
Expand All @@ -102,6 +110,10 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.32.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.32.0"
kubernetesVersion: ">=1.32.0 <1.37.0"

- name: ubuntu-os-cloud/ubuntu-2604-resolute-amd64-v20260425
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.36.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.36.0"
kubernetesVersion: ">=1.37.0"

- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
providerID: azure
architectureID: amd64
Expand All @@ -114,6 +126,10 @@ spec:
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.32.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.32.0"
kubernetesVersion: ">=1.32.0 <1.37.0"

- name: Canonical:ubuntu-26_04-lts:server:26.04.20260425
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.36.0"
Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kubernetesVersion: ">=1.36.0"
kubernetesVersion: ">=1.37.0"

Copy link
Copy Markdown
Member

@hakman hakman Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should add the arm64 image also.

cluster:
kubernetesVersion: v1.5.8
networking:
Expand Down
16 changes: 16 additions & 0 deletions channels/stable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ spec:
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-amd64-server-20260425
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.36.0"
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-arm64-server-20260425
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.36.0"
- name: cos-cloud/cos-stable-65-10323-99-0
providerID: gce
architectureID: amd64
Expand All @@ -102,6 +110,10 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: ubuntu-os-cloud/ubuntu-2604-resolute-amd64-v20260425
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.36.0"
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
providerID: azure
architectureID: amd64
Expand All @@ -114,6 +126,10 @@ spec:
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: Canonical:ubuntu-26_04-lts:server:26.04.20260425
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.36.0"
cluster:
kubernetesVersion: v1.5.8
networking:
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/kops/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,18 @@ func RecommendedKubernetesVersion(c *Channel, kopsVersionString string) *semver.
// Returns true if the given image name has the stable or alpha channel images prefix. Otherwise false.
func (c *Channel) HasUpstreamImagePrefix(image string) bool {
return strings.HasPrefix(image, "kope.io/k8s-") ||
strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-") ||
strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-") ||
strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-") ||
strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-") ||
strings.HasPrefix(image, "cos-cloud/cos-stable-") ||
strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-2604-resolute-") ||
strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-2004-focal-") ||
strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-2204-jammy-") ||
strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-2404-noble-") ||
strings.HasPrefix(image, "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:") ||
strings.HasPrefix(image, "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:") ||
strings.HasPrefix(image, "Canonical:ubuntu-26_04-lts:server:") ||
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server-gen1:") ||
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server:")
}
Expand Down
Loading