Skip to content

Commit 4a4716a

Browse files
hakmanhakman
committed
kOps: Add support for Ubuntu 25.10 (Questing Quokka)
1 parent 88284d9 commit 4a4716a

File tree

5 files changed

+268
-2
lines changed

5 files changed

+268
-2
lines changed

‎config/jobs/kubernetes/kops/build_vars.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
"ubuntu2204arm64",
7878
"ubuntu2404",
7979
"ubuntu2404arm64",
80+
"ubuntu2510",
81+
"ubuntu2510arm64",
8082
"amazonlinux2",
8183
"al2023",
8284
"al2023arm64",

‎config/jobs/kubernetes/kops/helpers.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ def latest_gce_image(project, family, arch="X86_64"):
244244
'u2204arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*', 'arm64'), # pylint: disable=line-too-long
245245
'u2404': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*'), # pylint: disable=line-too-long
246246
'u2404arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-*', 'arm64'), # pylint: disable=line-too-long
247+
'u2510': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-amd64-server-*'), # pylint: disable=line-too-long
248+
'u2510arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-arm64-server-*', 'arm64'), # pylint: disable=line-too-long
247249
}
248250

249251
distros_ssh_user = {
@@ -266,4 +268,6 @@ def latest_gce_image(project, family, arch="X86_64"):
266268
'u2204arm64': 'ubuntu',
267269
'u2404': 'ubuntu',
268270
'u2404arm64': 'ubuntu',
271+
'u2510': 'ubuntu',
272+
'u2510arm64': 'ubuntu',
269273
}

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

Lines changed: 128 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Test jobs generated by build_jobs.py (do not manually edit)
2-
# 14 jobs, total of 294 runs per week
2+
# 16 jobs, total of 336 runs per week
33
periodics:
44

55
# {"cloud": "aws", "distro": "deb11", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
@@ -446,6 +446,133 @@ periodics:
446446
testgrid-days-of-results: '90'
447447
testgrid-tab-name: kops-aws-distro-ubuntu2404arm64
448448

449+
# {"cloud": "aws", "distro": "u2510", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
450+
- name: e2e-kops-aws-distro-ubuntu2510
451+
cron: '23 1-23/8 * * *'
452+
labels:
453+
preset-service-account: "true"
454+
preset-aws-ssh: "true"
455+
preset-aws-credential: "true"
456+
cluster: k8s-infra-kops-prow-build
457+
decorate: true
458+
decoration_config:
459+
timeout: 90m
460+
extra_refs:
461+
- org: kubernetes
462+
repo: kops
463+
base_ref: master
464+
workdir: true
465+
path_alias: k8s.io/kops
466+
spec:
467+
containers:
468+
- command:
469+
- runner.sh
470+
args:
471+
- bash
472+
- -c
473+
- |
474+
make test-e2e-install
475+
kubetest2 kops \
476+
-v 2 \
477+
--up --down \
478+
--cloud-provider=aws \
479+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-amd64-server-20251007' --channel=alpha --networking=cilium" \
480+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
481+
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
482+
--test=kops \
483+
-- \
484+
--test-args="-test.timeout=60m" \
485+
--test-package-marker=stable.txt \
486+
--parallel=25
487+
env:
488+
- name: KUBE_SSH_KEY_PATH
489+
value: /etc/aws-ssh/aws-ssh-private
490+
- name: KUBE_SSH_USER
491+
value: ubuntu
492+
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
493+
imagePullPolicy: Always
494+
resources:
495+
limits:
496+
cpu: "4"
497+
memory: 6Gi
498+
requests:
499+
cpu: "4"
500+
memory: 6Gi
501+
annotations:
502+
test.kops.k8s.io/cloud: aws
503+
test.kops.k8s.io/distro: u2510
504+
test.kops.k8s.io/k8s_version: stable
505+
test.kops.k8s.io/kops_channel: alpha
506+
test.kops.k8s.io/kops_version: latest
507+
test.kops.k8s.io/networking: cilium
508+
testgrid-dashboards: kops-distro-u2510, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
509+
testgrid-days-of-results: '90'
510+
testgrid-tab-name: kops-aws-distro-ubuntu2510
511+
512+
# {"cloud": "aws", "distro": "u2510arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
513+
- name: e2e-kops-aws-distro-ubuntu2510arm64
514+
cron: '31 0-23/8 * * *'
515+
labels:
516+
preset-service-account: "true"
517+
preset-aws-ssh: "true"
518+
preset-aws-credential: "true"
519+
cluster: k8s-infra-kops-prow-build
520+
decorate: true
521+
decoration_config:
522+
timeout: 90m
523+
extra_refs:
524+
- org: kubernetes
525+
repo: kops
526+
base_ref: master
527+
workdir: true
528+
path_alias: k8s.io/kops
529+
spec:
530+
containers:
531+
- command:
532+
- runner.sh
533+
args:
534+
- bash
535+
- -c
536+
- |
537+
make test-e2e-install
538+
kubetest2 kops \
539+
-v 2 \
540+
--up --down \
541+
--cloud-provider=aws \
542+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-arm64-server-20251007' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large" \
543+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
544+
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
545+
--test=kops \
546+
-- \
547+
--test-args="-test.timeout=60m" \
548+
--test-package-marker=stable.txt \
549+
--parallel=25
550+
env:
551+
- name: KUBE_SSH_KEY_PATH
552+
value: /etc/aws-ssh/aws-ssh-private
553+
- name: KUBE_SSH_USER
554+
value: ubuntu
555+
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
556+
imagePullPolicy: Always
557+
resources:
558+
limits:
559+
cpu: "4"
560+
memory: 6Gi
561+
requests:
562+
cpu: "4"
563+
memory: 6Gi
564+
annotations:
565+
test.kops.k8s.io/cloud: aws
566+
test.kops.k8s.io/distro: u2510arm64
567+
test.kops.k8s.io/extra_flags: --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large
568+
test.kops.k8s.io/k8s_version: stable
569+
test.kops.k8s.io/kops_channel: alpha
570+
test.kops.k8s.io/kops_version: latest
571+
test.kops.k8s.io/networking: cilium
572+
testgrid-dashboards: kops-distro-u2510, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
573+
testgrid-days-of-results: '90'
574+
testgrid-tab-name: kops-aws-distro-ubuntu2510arm64
575+
449576
# {"cloud": "aws", "distro": "amzn2", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
450577
- name: e2e-kops-aws-distro-amazonlinux2
451578
cron: '59 1-23/8 * * *'

‎config/jobs/kubernetes/kops/kops-presubmits-distros.yaml‎

Lines changed: 132 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Test jobs generated by build_jobs.py (do not manually edit)
2-
# 14 jobs
2+
# 16 jobs
33
presubmits:
44
kubernetes/kops:
55

@@ -461,6 +461,137 @@ presubmits:
461461
testgrid-days-of-results: '90'
462462
testgrid-tab-name: e2e-ubuntu2404arm64
463463

464+
# {"cloud": "aws", "distro": "u2510", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
465+
- name: pull-kops-aws-distro-ubuntu2510
466+
cluster: k8s-infra-kops-prow-build
467+
branches:
468+
- master
469+
always_run: false
470+
optional: false
471+
skip_report: false
472+
labels:
473+
preset-service-account: "true"
474+
preset-aws-ssh: "true"
475+
preset-aws-credential: "true"
476+
decorate: true
477+
decoration_config:
478+
timeout: 90m
479+
path_alias: k8s.io/kops
480+
spec:
481+
containers:
482+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
483+
imagePullPolicy: Always
484+
command:
485+
- runner.sh
486+
args:
487+
- bash
488+
- -c
489+
- |
490+
make test-e2e-install
491+
kubetest2 kops \
492+
-v 2 \
493+
--up --build --down \
494+
--cloud-provider=aws \
495+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-amd64-server-20251007' --channel=alpha --networking=cilium" \
496+
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
497+
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
498+
--test=kops \
499+
-- \
500+
--test-args="-test.timeout=60m" \
501+
--test-package-marker=stable.txt \
502+
--parallel=25
503+
securityContext:
504+
privileged: true
505+
env:
506+
- name: KUBE_SSH_KEY_PATH
507+
value: /etc/aws-ssh/aws-ssh-private
508+
- name: KUBE_SSH_USER
509+
value: ubuntu
510+
- name: GOPATH
511+
value: /home/prow/go
512+
resources:
513+
limits:
514+
cpu: "4"
515+
memory: 6Gi
516+
requests:
517+
cpu: "4"
518+
memory: 6Gi
519+
annotations:
520+
test.kops.k8s.io/cloud: aws
521+
test.kops.k8s.io/distro: u2510
522+
test.kops.k8s.io/k8s_version: stable
523+
test.kops.k8s.io/kops_channel: alpha
524+
test.kops.k8s.io/networking: cilium
525+
testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
526+
testgrid-days-of-results: '90'
527+
testgrid-tab-name: e2e-ubuntu2510
528+
529+
# {"cloud": "aws", "distro": "u2510arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
530+
- name: pull-kops-aws-distro-ubuntu2510arm64
531+
cluster: k8s-infra-kops-prow-build
532+
branches:
533+
- master
534+
always_run: false
535+
optional: false
536+
skip_report: false
537+
labels:
538+
preset-service-account: "true"
539+
preset-aws-ssh: "true"
540+
preset-aws-credential: "true"
541+
decorate: true
542+
decoration_config:
543+
timeout: 90m
544+
path_alias: k8s.io/kops
545+
spec:
546+
containers:
547+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
548+
imagePullPolicy: Always
549+
command:
550+
- runner.sh
551+
args:
552+
- bash
553+
- -c
554+
- |
555+
make test-e2e-install
556+
kubetest2 kops \
557+
-v 2 \
558+
--up --build --down \
559+
--cloud-provider=aws \
560+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-arm64-server-20251007' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large" \
561+
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
562+
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
563+
--test=kops \
564+
-- \
565+
--test-args="-test.timeout=60m" \
566+
--test-package-marker=stable.txt \
567+
--parallel=25
568+
securityContext:
569+
privileged: true
570+
env:
571+
- name: KUBE_SSH_KEY_PATH
572+
value: /etc/aws-ssh/aws-ssh-private
573+
- name: KUBE_SSH_USER
574+
value: ubuntu
575+
- name: GOPATH
576+
value: /home/prow/go
577+
resources:
578+
limits:
579+
cpu: "4"
580+
memory: 6Gi
581+
requests:
582+
cpu: "4"
583+
memory: 6Gi
584+
annotations:
585+
test.kops.k8s.io/cloud: aws
586+
test.kops.k8s.io/distro: u2510arm64
587+
test.kops.k8s.io/extra_flags: --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large
588+
test.kops.k8s.io/k8s_version: stable
589+
test.kops.k8s.io/kops_channel: alpha
590+
test.kops.k8s.io/networking: cilium
591+
testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
592+
testgrid-days-of-results: '90'
593+
testgrid-tab-name: e2e-ubuntu2510arm64
594+
464595
# {"cloud": "aws", "distro": "amzn2", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
465596
- name: pull-kops-aws-distro-amazonlinux2
466597
cluster: k8s-infra-kops-prow-build

‎config/jobs/kubernetes/kops/pinned.list‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ aws://images/099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-
2323
aws://images/099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*:arm64=099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20251001
2424
aws://images/099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*:x86_64=099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251001
2525
aws://images/099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-*:arm64=099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20251001
26+
aws://images/099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-amd64-server-*:x86_64=099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-amd64-server-20251007
27+
aws://images/099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-arm64-server-*:arm64=099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-arm64-server-20251007

0 commit comments

Comments
 (0)