Skip to content

Commit 6f1857f

Browse files
ameukamameukam
authored
kOps: drop Debian 10 and Ubuntu 20.04 (#35412)
* kOps: drop Debian 10 and Ubuntu 20.04 Both distributions are now EOL and no longer receive security patches. Signed-off-by: Arnaud Meukam <[email protected]> * make generate executed Signed-off-by: Arnaud Meukam <[email protected]> * Drop the distros from Testgrid config Signed-off-by: Arnaud Meukam <[email protected]> * Fix testgrid dashboard name Signed-off-by: Arnaud Meukam <[email protected]> --------- Signed-off-by: Arnaud Meukam <[email protected]>
1 parent 54baffb commit 6f1857f

File tree

9 files changed

+529
-933
lines changed

9 files changed

+529
-933
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ def presubmit_test(branch='master',
465465
'deb13',
466466
'flatcar',
467467
'rhel8',
468-
'u2004',
469468
'u2204',
469+
'u2404',
470470
]
471471

472472
k8s_versions = [
@@ -511,7 +511,7 @@ def generate_grid():
511511
# TODO(justinsb): merge into above block when we can
512512
# pylint: disable=too-many-nested-blocks
513513
for networking in ['kubenet', 'calico', 'cilium', 'gce']: # TODO: all networking_options:
514-
for distro in ['u2004']: # TODO: all distro_options:
514+
for distro in ['u2204']: # TODO: all distro_options:
515515
for k8s_version in k8s_versions:
516516
for kops_version in [None]: # TODO: all kops_versions:
517517
results.append(
@@ -1407,8 +1407,7 @@ def generate_conformance():
14071407
###############################
14081408
# kops-periodics-distros.yaml #
14091409
###############################
1410-
distros = ['debian10', 'debian11', 'debian12', 'debian13',
1411-
'ubuntu2004', 'ubuntu2004arm64',
1410+
distros = ['debian11', 'debian12', 'debian13',
14121411
'ubuntu2204', 'ubuntu2204arm64',
14131412
'ubuntu2404', 'ubuntu2404arm64',
14141413
'amazonlinux2', 'al2023',
@@ -1425,7 +1424,7 @@ def generate_distros():
14251424
"--node-size=m6g.large",
14261425
"--master-size=m6g.large"
14271426
])
1428-
if distro in ['amazonlinux2', 'debian10', 'debian11', 'rhel8', 'ubuntu2004']:
1427+
if distro in ['amazonlinux2', 'debian11', 'rhel8']:
14291428
extra_flags.extend([
14301429
"--set=cluster.spec.containerd.version=1.7.28",
14311430
"--set=cluster.spec.containerd.runc.version=1.3.0",
@@ -1457,7 +1456,7 @@ def generate_presubmits_distros():
14571456
"--node-size=m6g.large",
14581457
"--master-size=m6g.large"
14591458
])
1460-
if distro in ['amazonlinux2', 'debian10', 'debian11', 'rhel8', 'ubuntu2004']:
1459+
if distro in ['amazonlinux2', 'debian11', 'rhel8']:
14611460
extra_flags.extend([
14621461
"--set=cluster.spec.containerd.version=1.7.28",
14631462
"--set=cluster.spec.containerd.runc.version=1.3.0",
@@ -2146,7 +2145,7 @@ def generate_presubmits_e2e():
21462145
presubmit_test(
21472146
name="pull-kops-e2e-aws-load-balancer-controller",
21482147
cloud="aws",
2149-
distro="u2004",
2148+
distro="u2204",
21502149
networking="calico",
21512150
scenario="aws-lb-controller",
21522151
tab_name="pull-kops-e2e-aws-load-balancer-controller",

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ def latest_aws_image(owner, name, arch='x86_64'):
177177
distro_images = {
178178
'al2023': latest_aws_image('137112412989', 'al2023-ami-2*-kernel-6.1-x86_64'),
179179
'amzn2': latest_aws_image('137112412989', 'amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2'),
180-
'deb10': latest_aws_image('136693071363', 'debian-10-amd64-*'),
181180
'deb11': latest_aws_image('136693071363', 'debian-11-amd64-*'),
182181
'deb12': latest_aws_image('136693071363', 'debian-12-amd64-*'),
183182
'deb13': latest_aws_image('136693071363', 'debian-13-amd64-*'),
@@ -187,8 +186,6 @@ def latest_aws_image(owner, name, arch='x86_64'):
187186
'rhel8': latest_aws_image('309956199498', 'RHEL-8.*_HVM-*-x86_64-*'),
188187
'rhel9': latest_aws_image('309956199498', 'RHEL-9.*_HVM-*-x86_64-*'),
189188
'rocky9': latest_aws_image('792107900819', 'Rocky-9-EC2-Base-9.*.x86_64'),
190-
'u2004': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*'), # pylint: disable=line-too-long
191-
'u2004arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-*', 'arm64'), # pylint: disable=line-too-long
192189
'u2204': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*'), # pylint: disable=line-too-long
193190
'u2204arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*', 'arm64'), # pylint: disable=line-too-long
194191
'u2404': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*'), # pylint: disable=line-too-long

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

Lines changed: 1 addition & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,7 @@
11
# Test jobs generated by build_jobs.py (do not manually edit)
2-
# 16 jobs, total of 336 runs per week
2+
# 13 jobs, total of 273 runs per week
33
periodics:
44

5-
# {"cloud": "aws", "distro": "deb10", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
6-
- name: e2e-kops-aws-distro-debian10
7-
cron: '52 1-23/8 * * *'
8-
labels:
9-
preset-service-account: "true"
10-
preset-aws-ssh: "true"
11-
preset-aws-credential: "true"
12-
cluster: k8s-infra-kops-prow-build
13-
decorate: true
14-
decoration_config:
15-
timeout: 90m
16-
extra_refs:
17-
- org: kubernetes
18-
repo: kops
19-
base_ref: master
20-
workdir: true
21-
path_alias: k8s.io/kops
22-
spec:
23-
containers:
24-
- command:
25-
- runner.sh
26-
args:
27-
- bash
28-
- -c
29-
- |
30-
make test-e2e-install
31-
kubetest2 kops \
32-
-v 2 \
33-
--up --down \
34-
--cloud-provider=aws \
35-
--create-args="--image='136693071363/debian-10-amd64-20240703-1797' --channel=alpha --networking=cilium --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery" \
36-
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
37-
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
38-
--test=kops \
39-
-- \
40-
--test-args="-test.timeout=60m" \
41-
--test-package-marker=stable.txt \
42-
--parallel=25
43-
env:
44-
- name: KUBE_SSH_KEY_PATH
45-
value: /etc/aws-ssh/aws-ssh-private
46-
- name: KUBE_SSH_USER
47-
value: admin
48-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250815-171060767f-master
49-
imagePullPolicy: Always
50-
resources:
51-
limits:
52-
cpu: "4"
53-
memory: 6Gi
54-
requests:
55-
cpu: "4"
56-
memory: 6Gi
57-
annotations:
58-
test.kops.k8s.io/cloud: aws
59-
test.kops.k8s.io/distro: deb10
60-
test.kops.k8s.io/extra_flags: --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery
61-
test.kops.k8s.io/k8s_version: stable
62-
test.kops.k8s.io/kops_channel: alpha
63-
test.kops.k8s.io/kops_version: latest
64-
test.kops.k8s.io/networking: cilium
65-
testgrid-dashboards: kops-distro-deb10, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
66-
testgrid-days-of-results: '90'
67-
testgrid-tab-name: kops-aws-distro-debian10
68-
695
# {"cloud": "aws", "distro": "deb11", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
706
- name: e2e-kops-aws-distro-debian11
717
cron: '42 7-23/8 * * *'
@@ -258,134 +194,6 @@ periodics:
258194
testgrid-days-of-results: '90'
259195
testgrid-tab-name: kops-aws-distro-debian13
260196

261-
# {"cloud": "aws", "distro": "u2004", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
262-
- name: e2e-kops-aws-distro-ubuntu2004
263-
cron: '44 2-23/8 * * *'
264-
labels:
265-
preset-service-account: "true"
266-
preset-aws-ssh: "true"
267-
preset-aws-credential: "true"
268-
cluster: k8s-infra-kops-prow-build
269-
decorate: true
270-
decoration_config:
271-
timeout: 90m
272-
extra_refs:
273-
- org: kubernetes
274-
repo: kops
275-
base_ref: master
276-
workdir: true
277-
path_alias: k8s.io/kops
278-
spec:
279-
containers:
280-
- command:
281-
- runner.sh
282-
args:
283-
- bash
284-
- -c
285-
- |
286-
make test-e2e-install
287-
kubetest2 kops \
288-
-v 2 \
289-
--up --down \
290-
--cloud-provider=aws \
291-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250624' --channel=alpha --networking=cilium --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery" \
292-
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
293-
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
294-
--test=kops \
295-
-- \
296-
--test-args="-test.timeout=60m" \
297-
--test-package-marker=stable.txt \
298-
--parallel=25
299-
env:
300-
- name: KUBE_SSH_KEY_PATH
301-
value: /etc/aws-ssh/aws-ssh-private
302-
- name: KUBE_SSH_USER
303-
value: ubuntu
304-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250815-171060767f-master
305-
imagePullPolicy: Always
306-
resources:
307-
limits:
308-
cpu: "4"
309-
memory: 6Gi
310-
requests:
311-
cpu: "4"
312-
memory: 6Gi
313-
annotations:
314-
test.kops.k8s.io/cloud: aws
315-
test.kops.k8s.io/distro: u2004
316-
test.kops.k8s.io/extra_flags: --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --discovery-store=s3://k8s-kops-prow/discovery
317-
test.kops.k8s.io/k8s_version: stable
318-
test.kops.k8s.io/kops_channel: alpha
319-
test.kops.k8s.io/kops_version: latest
320-
test.kops.k8s.io/networking: cilium
321-
testgrid-dashboards: kops-distro-u2004, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
322-
testgrid-days-of-results: '90'
323-
testgrid-tab-name: kops-aws-distro-ubuntu2004
324-
325-
# {"cloud": "aws", "distro": "u2004arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
326-
- name: e2e-kops-aws-distro-ubuntu2004arm64
327-
cron: '45 6-23/8 * * *'
328-
labels:
329-
preset-service-account: "true"
330-
preset-aws-ssh: "true"
331-
preset-aws-credential: "true"
332-
cluster: k8s-infra-kops-prow-build
333-
decorate: true
334-
decoration_config:
335-
timeout: 90m
336-
extra_refs:
337-
- org: kubernetes
338-
repo: kops
339-
base_ref: master
340-
workdir: true
341-
path_alias: k8s.io/kops
342-
spec:
343-
containers:
344-
- command:
345-
- runner.sh
346-
args:
347-
- bash
348-
- -c
349-
- |
350-
make test-e2e-install
351-
kubetest2 kops \
352-
-v 2 \
353-
--up --down \
354-
--cloud-provider=aws \
355-
--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" \
356-
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
357-
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
358-
--test=kops \
359-
-- \
360-
--test-args="-test.timeout=60m" \
361-
--test-package-marker=stable.txt \
362-
--parallel=25
363-
env:
364-
- name: KUBE_SSH_KEY_PATH
365-
value: /etc/aws-ssh/aws-ssh-private
366-
- name: KUBE_SSH_USER
367-
value: ubuntu
368-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250815-171060767f-master
369-
imagePullPolicy: Always
370-
resources:
371-
limits:
372-
cpu: "4"
373-
memory: 6Gi
374-
requests:
375-
cpu: "4"
376-
memory: 6Gi
377-
annotations:
378-
test.kops.k8s.io/cloud: aws
379-
test.kops.k8s.io/distro: u2004arm64
380-
test.kops.k8s.io/extra_flags: --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery
381-
test.kops.k8s.io/k8s_version: stable
382-
test.kops.k8s.io/kops_channel: alpha
383-
test.kops.k8s.io/kops_version: latest
384-
test.kops.k8s.io/networking: cilium
385-
testgrid-dashboards: kops-distro-u2004, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
386-
testgrid-days-of-results: '90'
387-
testgrid-tab-name: kops-aws-distro-ubuntu2004arm64
388-
389197
# {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
390198
- name: e2e-kops-aws-distro-ubuntu2204
391199
cron: '34 4-23/8 * * *'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ periodics:
6060
test.kops.k8s.io/kops_channel: alpha
6161
test.kops.k8s.io/kops_version: ''
6262
test.kops.k8s.io/networking: ''
63-
testgrid-dashboards: kops-distro-u2004, kops-gce, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
63+
testgrid-dashboards: kops-distro-u2404, kops-gce, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
6464
testgrid-days-of-results: '40'
6565
testgrid-tab-name: kops-gce-stable
6666

@@ -127,6 +127,6 @@ periodics:
127127
test.kops.k8s.io/kops_channel: alpha
128128
test.kops.k8s.io/kops_version: ''
129129
test.kops.k8s.io/networking: ''
130-
testgrid-dashboards: kops-distro-u2004, kops-gce, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
130+
testgrid-dashboards: kops-distro-u2404, kops-gce, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
131131
testgrid-days-of-results: '40'
132132
testgrid-tab-name: kops-gce-latest

0 commit comments

Comments
 (0)