Sitelet https://github.com/kubernetes/test-infra/commit/17c4f9e9568cb24406ef5e5141d901b1b3df0ef5
Skip to content

Commit 17c4f9e

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request #37691 from rifelpet/kops-gce-cos129
kops: add COS 129 to the GCE grid and age out COS 121
2 parents a331012 + 134344b commit 17c4f9e

7 files changed

Lines changed: 3243 additions & 2829 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,14 @@ def drop_unsupported_versions(original_list, version_to_drop):
6161

6262
# GCE distributions
6363
gce_distro_options = {
64-
"cos121": kops_versions,
65-
"cos121arm64": kops_versions,
64+
# None is the "latest kops" entry, so it has to be dropped explicitly to stop
65+
# testing an aged-out distro against newer kops.
66+
"cos121": drop_unsupported_versions(kops_versions, [None, '1.36']),
67+
"cos121arm64": drop_unsupported_versions(kops_versions, [None, '1.36']),
6668
"cos125": kops_versions,
6769
"cos125arm64": kops_versions,
70+
"cos129": drop_unsupported_versions(kops_versions, ['1.33', '1.34', '1.35']),
71+
"cos129arm64": drop_unsupported_versions(kops_versions, ['1.33', '1.34', '1.35']),
6872
"cosdev": kops_versions,
6973
"cosdevarm64": kops_versions,
7074
"debian12": kops_versions,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,8 @@ def latest_azure_image(publisher, offer, sku, arch="X86_64"):
319319
"cos121arm64": latest_gce_image("cos-cloud", "cos-arm64-121-lts", "ARM64"),
320320
"cos125": latest_gce_image("cos-cloud", "cos-125-lts"),
321321
"cos125arm64": latest_gce_image("cos-cloud", "cos-arm64-125-lts", "ARM64"),
322+
"cos129": latest_gce_image("cos-cloud", "cos-129-lts"),
323+
"cos129arm64": latest_gce_image("cos-cloud", "cos-arm64-129-lts", "ARM64"),
322324
"cosdev": latest_gce_image("cos-cloud", "cos-dev"),
323325
"cosdevarm64": latest_gce_image("cos-cloud", "cos-arm64-dev", "ARM64"),
324326
"rocky10": latest_gce_image("rocky-linux-cloud", "rocky-linux-10-optimized-gcp"),

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

Lines changed: 2825 additions & 2825 deletions
Large diffs are not rendered by default.

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

Lines changed: 133 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-
# 36 jobs, total of 756 runs per week
2+
# 38 jobs, total of 798 runs per week
33
periodics:
44

55
# {"cloud": "aws", "distro": "deb11", "extra_flags": "--set=cluster.spec.kubeProxy.proxyMode=nftables", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "kindnet"}
@@ -1401,6 +1401,138 @@ periodics:
14011401
testgrid-days-of-results: '90'
14021402
testgrid-tab-name: kops-gce-nftables-cos125arm64
14031403

1404+
# {"cloud": "gce", "distro": "cos129", "extra_flags": "--set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "kindnet"}
1405+
- name: e2e-kops-gce-nftables-cos129
1406+
cron: '44 5-23/8 * * *'
1407+
labels:
1408+
preset-k8s-ssh: "true"
1409+
cluster: k8s-infra-prow-build
1410+
decorate: true
1411+
decoration_config:
1412+
timeout: 90m
1413+
extra_refs:
1414+
- org: kubernetes
1415+
repo: kops
1416+
base_ref: master
1417+
workdir: true
1418+
path_alias: k8s.io/kops
1419+
spec:
1420+
serviceAccountName: k8s-kops-test
1421+
containers:
1422+
- command:
1423+
- runner.sh
1424+
args:
1425+
- bash
1426+
- -c
1427+
- |
1428+
make test-e2e-install
1429+
kubetest2 kops \
1430+
-v 2 \
1431+
--up --down \
1432+
--cloud-provider=gce \
1433+
--admin-access=0.0.0.0/0 \
1434+
--create-args="--image='cos-cloud/cos-129-19506-299-116' --channel=alpha --networking=kindnet --set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default" \
1435+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
1436+
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
1437+
--test=kops \
1438+
-- \
1439+
--test-args="-test.timeout=60m" \
1440+
--test-package-marker=stable.txt \
1441+
--parallel=25
1442+
env:
1443+
- name: KUBE_SSH_KEY_PATH
1444+
value: /etc/ssh-key-secret/ssh-private
1445+
- name: KUBE_SSH_USER
1446+
value: prow
1447+
- name: GINKGO_NO_COLOR
1448+
value: "TRUE"
1449+
image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20260810-7619858115-master
1450+
imagePullPolicy: Always
1451+
resources:
1452+
limits:
1453+
cpu: "4"
1454+
memory: 6Gi
1455+
requests:
1456+
cpu: "4"
1457+
memory: 6Gi
1458+
annotations:
1459+
test.kops.k8s.io/cloud: gce
1460+
test.kops.k8s.io/distro: cos129
1461+
test.kops.k8s.io/extra_flags: --set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default
1462+
test.kops.k8s.io/k8s_version: stable
1463+
test.kops.k8s.io/kops_channel: alpha
1464+
test.kops.k8s.io/kops_version: latest
1465+
test.kops.k8s.io/networking: kindnet
1466+
testgrid-dashboards: kops-distro-cos129, kops-gce, kops-k8s-stable, kops-latest, kops-network-kindnet, kops-nftables, sig-cluster-lifecycle-kops
1467+
testgrid-days-of-results: '90'
1468+
testgrid-tab-name: kops-gce-nftables-cos129
1469+
1470+
# {"cloud": "gce", "distro": "cos129arm64", "extra_flags": "--set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default --node-size=t2a-standard-2 --control-plane-size=t2a-standard-2 --zones=us-central1-a", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "kindnet"}
1471+
- name: e2e-kops-gce-nftables-cos129arm64
1472+
cron: '51 7-23/8 * * *'
1473+
labels:
1474+
preset-k8s-ssh: "true"
1475+
cluster: k8s-infra-prow-build
1476+
decorate: true
1477+
decoration_config:
1478+
timeout: 90m
1479+
extra_refs:
1480+
- org: kubernetes
1481+
repo: kops
1482+
base_ref: master
1483+
workdir: true
1484+
path_alias: k8s.io/kops
1485+
spec:
1486+
serviceAccountName: k8s-kops-test
1487+
containers:
1488+
- command:
1489+
- runner.sh
1490+
args:
1491+
- bash
1492+
- -c
1493+
- |
1494+
make test-e2e-install
1495+
kubetest2 kops \
1496+
-v 2 \
1497+
--up --down \
1498+
--cloud-provider=gce \
1499+
--admin-access=0.0.0.0/0 \
1500+
--create-args="--image='cos-cloud/cos-arm64-129-19506-299-116' --channel=alpha --networking=kindnet --set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default --node-size=t2a-standard-2 --control-plane-size=t2a-standard-2 --zones=us-central1-a" \
1501+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
1502+
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
1503+
--test=kops \
1504+
-- \
1505+
--test-args="-test.timeout=60m" \
1506+
--test-package-marker=stable.txt \
1507+
--parallel=25
1508+
env:
1509+
- name: KUBE_SSH_KEY_PATH
1510+
value: /etc/ssh-key-secret/ssh-private
1511+
- name: KUBE_SSH_USER
1512+
value: prow
1513+
- name: GINKGO_NO_COLOR
1514+
value: "TRUE"
1515+
image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20260810-7619858115-master
1516+
imagePullPolicy: Always
1517+
resources:
1518+
limits:
1519+
cpu: "4"
1520+
memory: 6Gi
1521+
requests:
1522+
cpu: "4"
1523+
memory: 6Gi
1524+
annotations:
1525+
test.kops.k8s.io/cloud: gce
1526+
test.kops.k8s.io/distro: cos129arm64
1527+
test.kops.k8s.io/extra_flags: --set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default --node-size=t2a-standard-2 --control-plane-size=t2a-standard-2 --zones=us-central1-a
1528+
test.kops.k8s.io/k8s_version: stable
1529+
test.kops.k8s.io/kops_channel: alpha
1530+
test.kops.k8s.io/kops_version: latest
1531+
test.kops.k8s.io/networking: kindnet
1532+
testgrid-dashboards: kops-distro-cos129, kops-gce, kops-k8s-stable, kops-latest, kops-network-kindnet, kops-nftables, sig-cluster-lifecycle-kops
1533+
testgrid-days-of-results: '90'
1534+
testgrid-tab-name: kops-gce-nftables-cos129arm64
1535+
14041536
# {"cloud": "gce", "distro": "cosdev", "extra_flags": "--set=cluster.spec.kubeProxy.proxyMode=nftables --gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "kindnet"}
14051537
- name: e2e-kops-gce-nftables-cosdev
14061538
cron: '41 4-23/8 * * *'

0 commit comments

Comments
 (0)