Skip to content

Commit ca8e7eb

Browse files
authored
Merge pull request #35331 from ameukam/kops-add-debian-trixie
kOps: Add Debian 13 to the distros list
2 parents 1710607 + a891aeb commit ca8e7eb

14 files changed

+6464
-2665
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ def presubmit_test(branch='master',
462462
distro_options = [
463463
'al2023',
464464
'deb12',
465+
'deb13',
465466
'flatcar',
466467
'rhel8',
467468
'u2004',

config/jobs/kubernetes/kops/helpers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ def latest_aws_image(owner, name, arch='x86_64'):
180180
'deb10': latest_aws_image('136693071363', 'debian-10-amd64-*'),
181181
'deb11': latest_aws_image('136693071363', 'debian-11-amd64-*'),
182182
'deb12': latest_aws_image('136693071363', 'debian-12-amd64-*'),
183+
'deb13': latest_aws_image('136693071363', 'debian-13-amd64-*'),
184+
'deb13arm64': latest_aws_image('136693071363', 'debian-13-arm64-*', 'arm64'),
183185
'flatcar': latest_aws_image('075585003325', 'Flatcar-beta-*-hvm'),
184186
'flatcararm64': latest_aws_image('075585003325', 'Flatcar-beta-*-hvm', 'arm64'),
185187
'rhel8': latest_aws_image('309956199498', 'RHEL-8.*_HVM-*-x86_64-*'),
@@ -199,6 +201,8 @@ def latest_aws_image(owner, name, arch='x86_64'):
199201
'deb10': 'admin',
200202
'deb11': 'admin',
201203
'deb12': 'admin',
204+
'deb13': 'admin',
205+
'deb13arm64': 'admin',
202206
'flatcar': 'core',
203207
'flatcararm64': 'core',
204208
'rhel8': 'ec2-user',

config/jobs/kubernetes/kops/kops-periodics-conformance.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ periodics:
3232
-v 2 \
3333
--up --down \
3434
--cloud-provider=aws \
35-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
35+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
3636
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.33/latest-ci-updown-green.txt \
3737
--kubernetes-version=https://dl.k8s.io/release/stable-1.33.txt \
3838
--test=kops \
@@ -98,7 +98,7 @@ periodics:
9898
-v 2 \
9999
--up --down \
100100
--cloud-provider=aws \
101-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
101+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
102102
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.33/latest-ci-updown-green.txt \
103103
--kubernetes-version=https://dl.k8s.io/release/stable-1.33.txt \
104104
--test=kops \
@@ -164,7 +164,7 @@ periodics:
164164
-v 2 \
165165
--up --down \
166166
--cloud-provider=aws \
167-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
167+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
168168
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.32/latest-ci-updown-green.txt \
169169
--kubernetes-version=https://dl.k8s.io/release/stable-1.32.txt \
170170
--test=kops \
@@ -230,7 +230,7 @@ periodics:
230230
-v 2 \
231231
--up --down \
232232
--cloud-provider=aws \
233-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
233+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
234234
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.32/latest-ci-updown-green.txt \
235235
--kubernetes-version=https://dl.k8s.io/release/stable-1.32.txt \
236236
--test=kops \
@@ -296,7 +296,7 @@ periodics:
296296
-v 2 \
297297
--up --down \
298298
--cloud-provider=aws \
299-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
299+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
300300
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.31/latest-ci-updown-green.txt \
301301
--kubernetes-version=https://dl.k8s.io/release/stable-1.31.txt \
302302
--test=kops \
@@ -362,7 +362,7 @@ periodics:
362362
-v 2 \
363363
--up --down \
364364
--cloud-provider=aws \
365-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
365+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
366366
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.31/latest-ci-updown-green.txt \
367367
--kubernetes-version=https://dl.k8s.io/release/stable-1.31.txt \
368368
--test=kops \
@@ -428,7 +428,7 @@ periodics:
428428
-v 2 \
429429
--up --down \
430430
--cloud-provider=aws \
431-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
431+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
432432
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.30/latest-ci-updown-green.txt \
433433
--kubernetes-version=https://dl.k8s.io/release/stable-1.30.txt \
434434
--test=kops \
@@ -494,7 +494,7 @@ periodics:
494494
-v 2 \
495495
--up --down \
496496
--cloud-provider=aws \
497-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
497+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250731' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
498498
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.30/latest-ci-updown-green.txt \
499499
--kubernetes-version=https://dl.k8s.io/release/stable-1.30.txt \
500500
--test=kops \

config/jobs/kubernetes/kops/kops-periodics-distros.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ periodics:
9696
-v 2 \
9797
--up --down \
9898
--cloud-provider=aws \
99-
--create-args="--image='136693071363/debian-11-amd64-20250528-2126' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
99+
--create-args="--image='136693071363/debian-11-amd64-20250801-2191' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
100100
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
101101
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
102102
--test=kops \
@@ -160,7 +160,7 @@ periodics:
160160
-v 2 \
161161
--up --down \
162162
--cloud-provider=aws \
163-
--create-args="--image='136693071363/debian-12-amd64-20250530-2128' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
163+
--create-args="--image='136693071363/debian-12-amd64-20250814-2204' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
164164
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
165165
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
166166
--test=kops \
@@ -224,7 +224,7 @@ periodics:
224224
-v 2 \
225225
--up --down \
226226
--cloud-provider=aws \
227-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250603' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
227+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250624' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
228228
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
229229
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
230230
--test=kops \
@@ -288,7 +288,7 @@ periodics:
288288
-v 2 \
289289
--up --down \
290290
--cloud-provider=aws \
291-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20250603' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
291+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20250624' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
292292
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
293293
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
294294
--test=kops \
@@ -352,7 +352,7 @@ periodics:
352352
-v 2 \
353353
--up --down \
354354
--cloud-provider=aws \
355-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250617' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
355+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250801' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
356356
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
357357
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
358358
--test=kops \
@@ -416,7 +416,7 @@ periodics:
416416
-v 2 \
417417
--up --down \
418418
--cloud-provider=aws \
419-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250617' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
419+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250801' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
420420
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
421421
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
422422
--test=kops \
@@ -480,7 +480,7 @@ periodics:
480480
-v 2 \
481481
--up --down \
482482
--cloud-provider=aws \
483-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250610' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
483+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250731' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
484484
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
485485
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
486486
--test=kops \
@@ -544,7 +544,7 @@ periodics:
544544
-v 2 \
545545
--up --down \
546546
--cloud-provider=aws \
547-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
547+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250731' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
548548
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
549549
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
550550
--test=kops \
@@ -608,7 +608,7 @@ periodics:
608608
-v 2 \
609609
--up --down \
610610
--cloud-provider=aws \
611-
--create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20250623.0-x86_64-gp2' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
611+
--create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20250808.1-x86_64-gp2' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
612612
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
613613
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
614614
--test=kops \
@@ -672,7 +672,7 @@ periodics:
672672
-v 2 \
673673
--up --down \
674674
--cloud-provider=aws \
675-
--create-args="--image='137112412989/al2023-ami-2023.7.20250609.0-kernel-6.1-x86_64' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
675+
--create-args="--image='137112412989/al2023-ami-2023.8.20250808.1-kernel-6.1-x86_64' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
676676
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
677677
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
678678
--test=kops \
@@ -800,7 +800,7 @@ periodics:
800800
-v 2 \
801801
--up --down \
802802
--cloud-provider=aws \
803-
--create-args="--image='309956199498/RHEL-9.6.0_HVM-20250618-x86_64-0-Hourly2-GP3' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
803+
--create-args="--image='309956199498/RHEL-9.6.0_HVM-20250730-x86_64-0-Hourly2-GP3' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
804804
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
805805
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
806806
--test=kops \
@@ -928,7 +928,7 @@ periodics:
928928
-v 2 \
929929
--up --down \
930930
--cloud-provider=aws \
931-
--create-args="--image='075585003325/Flatcar-beta-4344.1.0-hvm' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
931+
--create-args="--image='075585003325/Flatcar-beta-4344.1.1-hvm' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
932932
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
933933
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
934934
--validation-wait=20m \

0 commit comments

Comments
 (0)