Sitelet https://github.com/kubernetes/kops/pull/18501/files
Skip to content

chore(channels): promote to stable, bump node images, update recommended kOps versions #18501

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

Merged
kubernetes-prow merged 5 commits into from
Jun 20, 2026
Merged

chore(channels): promote to stable, bump node images, update recommended kOps versions #18501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d446aeb
chore(channels): promote alpha to stable
hakman Jun 20, 2026
101e9d0
chore(channels): bump node images
hakman Jun 20, 2026
7ace323
chore(channels): recommend kOps 1.35.1 for k8s 1.30-1.35, 1.34.3 for …
hakman Jun 20, 2026
e00f4b8
chore(channels): add arm64 GCE and Azure noble node images
hakman Jun 20, 2026
d96b240
./hack/update-expected.sh
hakman Jun 20, 2026
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
40 changes: 24 additions & 16 deletions channels/alpha
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ spec:
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260410
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260610
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260410
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260610
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260218
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260610
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.32.0"
Expand All @@ -94,26 +94,34 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0 <1.27.0"
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20250615
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20260612
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20250606
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20260615
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
- name: ubuntu-os-cloud/ubuntu-2404-noble-arm64-v20260615
providerID: gce
architectureID: arm64
kubernetesVersion: ">=1.32.0"
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202505200
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202506120
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202606110
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: Canonical:ubuntu-24_04-lts:server:24.04.202507010
- name: Canonical:ubuntu-24_04-lts:server:24.04.202606120
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: Canonical:ubuntu-24_04-lts:server-arm64:24.04.202606110
providerID: azure
architectureID: arm64
kubernetesVersion: ">=1.32.0"
cluster:
kubernetesVersion: v1.5.8
networking:
Expand Down Expand Up @@ -206,31 +214,31 @@ spec:
#requiredVersion: 1.36.0
kubernetesVersion: 1.36.2
- range: ">=1.35.0-alpha.1"
recommendedVersion: "1.35.0-beta.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.35.0
kubernetesVersion: 1.35.6
- range: ">=1.34.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.34.0
kubernetesVersion: 1.34.9
- range: ">=1.33.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.33.0
kubernetesVersion: 1.33.13
- range: ">=1.32.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.32.0
kubernetesVersion: 1.32.13
- range: ">=1.31.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.31.0
kubernetesVersion: 1.31.14
- range: ">=1.30.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.30.0
kubernetesVersion: 1.30.14
- range: ">=1.29.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.34.3"
#requiredVersion: 1.29.0
kubernetesVersion: 1.29.15
- range: ">=1.28.0-alpha.1"
Expand Down
52 changes: 30 additions & 22 deletions channels/stable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ spec:
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260410
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260610
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260410
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260610
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260218
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260610
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.32.0"
Expand All @@ -94,26 +94,34 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0 <1.27.0"
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20250615
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20260612
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20250606
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20260615
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
- name: ubuntu-os-cloud/ubuntu-2404-noble-arm64-v20260615
providerID: gce
architectureID: arm64
kubernetesVersion: ">=1.32.0"
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202505200
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202506120
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202606110
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.27.0 <1.32.0"
- name: Canonical:ubuntu-24_04-lts:server:24.04.202507010
- name: Canonical:ubuntu-24_04-lts:server:24.04.202606120
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.32.0"
- name: Canonical:ubuntu-24_04-lts:server-arm64:24.04.202606110
providerID: azure
architectureID: arm64
kubernetesVersion: ">=1.32.0"
cluster:
kubernetesVersion: v1.5.8
networking:
Expand All @@ -123,13 +131,13 @@ spec:
recommendedVersion: 1.36.2
requiredVersion: 1.36.0
- range: ">=1.35.0"
recommendedVersion: 1.35.5
recommendedVersion: 1.35.6
requiredVersion: 1.35.0
- range: ">=1.34.0"
recommendedVersion: 1.34.8
recommendedVersion: 1.34.9
requiredVersion: 1.34.0
- range: ">=1.33.0"
recommendedVersion: 1.33.12
recommendedVersion: 1.33.13
requiredVersion: 1.33.0
- range: ">=1.32.0"
recommendedVersion: 1.32.13
Expand Down Expand Up @@ -206,31 +214,31 @@ spec:
#requiredVersion: 1.36.0
kubernetesVersion: 1.36.2
- range: ">=1.35.0-alpha.1"
recommendedVersion: "1.34.3"
recommendedVersion: "1.35.1"
#requiredVersion: 1.34.0
kubernetesVersion: 1.35.5
kubernetesVersion: 1.35.6
- range: ">=1.34.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.34.0
kubernetesVersion: 1.34.8
kubernetesVersion: 1.34.9
- range: ">=1.33.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.33.0
kubernetesVersion: 1.33.12
kubernetesVersion: 1.33.13
- range: ">=1.32.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.32.0
kubernetesVersion: 1.32.13
- range: ">=1.31.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.31.0
kubernetesVersion: 1.31.14
- range: ">=1.30.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.35.1"
#requiredVersion: 1.30.0
kubernetesVersion: 1.30.14
- range: ">=1.29.0-alpha.1"
recommendedVersion: "1.34.1"
recommendedVersion: "1.34.3"
#requiredVersion: 1.29.0
kubernetesVersion: 1.29.15
- range: ">=1.28.0-alpha.1"
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/kops/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@ func (c *Channel) HasUpstreamImagePrefix(image string) bool {
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-24_04-lts:server-gen1:") ||
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server:")
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server:") ||
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server-arm64:")
}

// GetPackageVersion returns the version for the package, or an error if could not be found.
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/create_cluster/calico_bpf/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: calico-bpf.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -90,7 +90,7 @@ metadata:
kops.k8s.io/cluster: calico-bpf.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 1
minSize: 1
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -91,7 +91,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 1
minSize: 1
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: bastions
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.micro
maxSize: 1
minSize: 1
Expand All @@ -161,7 +161,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -181,7 +181,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -201,7 +201,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -221,7 +221,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 4
minSize: 4
Expand All @@ -242,7 +242,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 3
minSize: 3
Expand All @@ -262,7 +262,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 3
minSize: 3
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -127,7 +127,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -147,7 +147,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -167,7 +167,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 4
minSize: 4
Expand All @@ -188,7 +188,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 3
minSize: 3
Expand All @@ -208,7 +208,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
machineType: t2.medium
maxSize: 3
minSize: 3
Expand Down
Loading