Skip to content

Commit df078e4

Browse files
authored
Merge pull request #35645 from hakman/kops-1.35
kOps: Add k8s 1.35 release
2 parents 7da3d0e + 5872c07 commit df078e4

File tree

7 files changed

+312
-329
lines changed

7 files changed

+312
-329
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def build_test(cloud='aws',
136136
build_cluster = 'k8s-infra-prow-build'
137137

138138
validation_wait = None
139-
if distro in ('flatcar', 'flatcararm64') or (distro in ('amzn2', 'rhel8') and kops_version in ('1.26', '1.27')):
139+
if distro in ('flatcar', 'flatcararm64'):
140140
validation_wait = '20m'
141141

142142
suffix = ""
@@ -524,9 +524,9 @@ def generate_misc():
524524
extra_dashboards=['sig-k8s-infra-canaries'],
525525
scenario='smoketest',
526526
env={
527-
'KOPS_BASE_URL': "https://artifacts.k8s.io/binaries/kops/1.28.4/",
528-
'KOPS_VERSION': "v1.28.4",
529-
'K8S_VERSION': "v1.28.6",
527+
'KOPS_BASE_URL': "https://artifacts.k8s.io/binaries/kops/1.33.1/",
528+
'KOPS_VERSION': "v1.33.1",
529+
'K8S_VERSION': "v1.33.5",
530530
'KOPS_SKIP_E2E': '1',
531531
'KOPS_CONTROL_PLANE_SIZE': '3',
532532
}),
@@ -1330,7 +1330,7 @@ def generate_misc():
13301330
################################
13311331
def generate_conformance():
13321332
results = []
1333-
for version in ['1.34', '1.33', '1.32', '1.31']:
1333+
for version in ['1.35', '1.34', '1.33', '1.32', '1.31']:
13341334
results.append(
13351335
build_test(
13361336
cloud='aws',
@@ -1808,7 +1808,7 @@ def generate_versions():
18081808
runs_per_day=8,
18091809
)
18101810
]
1811-
for version in ['1.34', '1.33', '1.32', '1.31', '1.30', '1.29', '1.28', '1.27']:
1811+
for version in ['1.35', '1.34', '1.33', '1.32', '1.31', '1.30', '1.29']:
18121812
results.append(
18131813
build_test(
18141814
cloud='aws',
@@ -1827,7 +1827,7 @@ def generate_versions():
18271827
######################
18281828
def generate_pipeline():
18291829
results = []
1830-
for version in ['master', '1.34', '1.33', '1.32', '1.31']:
1830+
for version in ['master', '1.35', '1.34', '1.33', '1.32', '1.31']:
18311831
branch = version if version == 'master' else f"release-{version}"
18321832
publish_version_marker = f"gs://k8s-staging-kops/kops/releases/markers/{branch}/latest-ci-updown-green.txt"
18331833
kops_version = f"https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/{branch}/latest-ci.txt"
@@ -2233,6 +2233,15 @@ def generate_presubmits_e2e():
22332233
tab_name='e2e-1-33',
22342234
always_run=True,
22352235
),
2236+
presubmit_test(
2237+
branch='release-1.34',
2238+
k8s_version='1.34',
2239+
kops_channel='alpha',
2240+
name='pull-kops-e2e-k8s-aws-cilium-1-34',
2241+
networking='cilium',
2242+
tab_name='e2e-1-34',
2243+
always_run=True,
2244+
),
22362245
presubmit_test(
22372246
branch='release-1.31',
22382247
k8s_version='1.31',
@@ -2260,33 +2269,6 @@ def generate_presubmits_e2e():
22602269
tab_name='e2e-1-29',
22612270
always_run=True,
22622271
),
2263-
presubmit_test(
2264-
branch='release-1.28',
2265-
k8s_version='1.28',
2266-
kops_channel='alpha',
2267-
name='pull-kops-e2e-k8s-aws-calico-1-28',
2268-
networking='calico',
2269-
tab_name='e2e-1-28',
2270-
always_run=True,
2271-
),
2272-
presubmit_test(
2273-
branch='release-1.27',
2274-
k8s_version='1.27',
2275-
kops_channel='alpha',
2276-
name='pull-kops-e2e-k8s-aws-calico-1-27',
2277-
networking='calico',
2278-
tab_name='e2e-1-27',
2279-
always_run=True,
2280-
),
2281-
presubmit_test(
2282-
branch='release-1.26',
2283-
k8s_version='1.26',
2284-
kops_channel='alpha',
2285-
name='pull-kops-e2e-k8s-aws-calico-1-26',
2286-
networking='calico',
2287-
tab_name='e2e-1-26',
2288-
always_run=True,
2289-
),
22902272

22912273
presubmit_test(
22922274
name="pull-kops-scenario-aws-karpenter",

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

Lines changed: 133 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,139 @@
11
# Test jobs generated by build_jobs.py (do not manually edit)
2-
# 8 jobs, total of 56 runs per week
2+
# 10 jobs, total of 70 runs per week
33
periodics:
44

5+
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.35", "kops_channel": "alpha", "kops_version": "1.35", "networking": "calico"}
6+
- name: e2e-kops-aws-conformance-1-35
7+
cron: '45 7-23/24 * * *'
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: 180m
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='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250920' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
36+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.35/latest-ci-updown-green.txt \
37+
--kubernetes-version=https://dl.k8s.io/release/stable-1.35.txt \
38+
--test=kops \
39+
-- \
40+
--test-args="-test.timeout=150m" \
41+
--test-package-marker=stable-1.35.txt \
42+
--focus-regex="\[Conformance\]" \
43+
--skip-regex="\[NoSkip\]" \
44+
--parallel=1
45+
env:
46+
- name: KUBE_SSH_KEY_PATH
47+
value: /etc/aws-ssh/aws-ssh-private
48+
- name: KUBE_SSH_USER
49+
value: ubuntu
50+
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
51+
imagePullPolicy: Always
52+
resources:
53+
limits:
54+
cpu: "4"
55+
memory: 6Gi
56+
requests:
57+
cpu: "4"
58+
memory: 6Gi
59+
annotations:
60+
test.kops.k8s.io/cloud: aws
61+
test.kops.k8s.io/distro: u2404
62+
test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery
63+
test.kops.k8s.io/k8s_version: '1.35'
64+
test.kops.k8s.io/kops_channel: alpha
65+
test.kops.k8s.io/kops_version: '1.35'
66+
test.kops.k8s.io/networking: calico
67+
testgrid-dashboards: conformance-all, kops-1.35, kops-conformance, kops-distro-u2404, kops-k8s-1.35, sig-cluster-lifecycle-kops
68+
testgrid-days-of-results: '90'
69+
testgrid-tab-name: kops-aws-conformance-1-35
70+
71+
# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.35", "kops_channel": "alpha", "kops_version": "1.35", "networking": "calico"}
72+
- name: e2e-kops-aws-conformance-arm64-1-35
73+
cron: '51 12-23/24 * * *'
74+
labels:
75+
preset-service-account: "true"
76+
preset-aws-ssh: "true"
77+
preset-aws-credential: "true"
78+
cluster: k8s-infra-kops-prow-build
79+
decorate: true
80+
decoration_config:
81+
timeout: 180m
82+
extra_refs:
83+
- org: kubernetes
84+
repo: kops
85+
base_ref: master
86+
workdir: true
87+
path_alias: k8s.io/kops
88+
spec:
89+
containers:
90+
- command:
91+
- runner.sh
92+
args:
93+
- bash
94+
- -c
95+
- |
96+
make test-e2e-install
97+
kubetest2 kops \
98+
-v 2 \
99+
--up --down \
100+
--cloud-provider=aws \
101+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250920' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
102+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.35/latest-ci-updown-green.txt \
103+
--kubernetes-version=https://dl.k8s.io/release/stable-1.35.txt \
104+
--test=kops \
105+
-- \
106+
--test-args="-test.timeout=150m" \
107+
--test-package-marker=stable-1.35.txt \
108+
--focus-regex="\[Conformance\]" \
109+
--skip-regex="\[NoSkip\]" \
110+
--parallel=1
111+
env:
112+
- name: KUBE_SSH_KEY_PATH
113+
value: /etc/aws-ssh/aws-ssh-private
114+
- name: KUBE_SSH_USER
115+
value: ubuntu
116+
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
117+
imagePullPolicy: Always
118+
resources:
119+
limits:
120+
cpu: "4"
121+
memory: 6Gi
122+
requests:
123+
cpu: "4"
124+
memory: 6Gi
125+
annotations:
126+
test.kops.k8s.io/cloud: aws
127+
test.kops.k8s.io/distro: u2404arm64
128+
test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery
129+
test.kops.k8s.io/k8s_version: '1.35'
130+
test.kops.k8s.io/kops_channel: alpha
131+
test.kops.k8s.io/kops_version: '1.35'
132+
test.kops.k8s.io/networking: calico
133+
testgrid-dashboards: conformance-all, conformance-arm64, kops-1.35, kops-conformance, kops-distro-u2404, kops-k8s-1.35, sig-cluster-lifecycle-kops
134+
testgrid-days-of-results: '90'
135+
testgrid-tab-name: kops-aws-conformance-arm64-1-35
136+
5137
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--zones=eu-central-1a --node-size=t3.large --master-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.34", "kops_channel": "alpha", "kops_version": "1.34", "networking": "calico"}
6138
- name: e2e-kops-aws-conformance-1-34
7139
cron: '15 1-23/24 * * *'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ periodics:
9393
- ./tests/e2e/scenarios/smoketest/run-test.sh
9494
env:
9595
- name: KOPS_BASE_URL
96-
value: "https://artifacts.k8s.io/binaries/kops/1.28.4/"
96+
value: "https://artifacts.k8s.io/binaries/kops/1.33.1/"
9797
- name: KOPS_VERSION
98-
value: "v1.28.4"
98+
value: "v1.33.1"
9999
- name: K8S_VERSION
100-
value: "v1.28.6"
100+
value: "v1.33.5"
101101
- name: KOPS_SKIP_E2E
102102
value: "1"
103103
- name: KOPS_CONTROL_PLANE_SIZE

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

Lines changed: 68 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-
# 5 jobs, total of 840 runs per week
2+
# 6 jobs, total of 1008 runs per week
33
periodics:
44

55
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
@@ -69,6 +69,73 @@ periodics:
6969
testgrid-days-of-results: '11'
7070
testgrid-tab-name: kops-pipeline-updown-kopsmaster
7171

72+
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.35", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
73+
- name: e2e-kops-pipeline-updown-kops135
74+
cron: '21 0-23/1 * * *'
75+
labels:
76+
preset-service-account: "true"
77+
preset-aws-ssh: "true"
78+
preset-aws-credential: "true"
79+
cluster: k8s-infra-kops-prow-build
80+
decorate: true
81+
decoration_config:
82+
timeout: 90m
83+
extra_refs:
84+
- org: kubernetes
85+
repo: kops
86+
base_ref: master
87+
workdir: true
88+
path_alias: k8s.io/kops
89+
spec:
90+
containers:
91+
- command:
92+
- runner.sh
93+
args:
94+
- bash
95+
- -c
96+
- |
97+
make test-e2e-install
98+
kubetest2 kops \
99+
-v 2 \
100+
--up --down \
101+
--cloud-provider=aws \
102+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250920' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
103+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.35/latest-ci.txt \
104+
--publish-version-marker=gs://k8s-staging-kops/kops/releases/markers/release-1.35/latest-ci-updown-green.txt \
105+
--kubernetes-version=https://dl.k8s.io/release/stable-1.35.txt \
106+
--test=kops \
107+
-- \
108+
--test-args="-test.timeout=60m" \
109+
--test-package-marker=stable-1.35.txt \
110+
--focus-regex="\[k8s.io\]\sNetworking.*\[Conformance\]" \
111+
--skip-regex="\[Slow\]|\[Serial\]" \
112+
--parallel=25
113+
env:
114+
- name: KUBE_SSH_KEY_PATH
115+
value: /etc/aws-ssh/aws-ssh-private
116+
- name: KUBE_SSH_USER
117+
value: ubuntu
118+
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
119+
imagePullPolicy: Always
120+
resources:
121+
limits:
122+
cpu: "4"
123+
memory: 6Gi
124+
requests:
125+
cpu: "4"
126+
memory: 6Gi
127+
annotations:
128+
test.kops.k8s.io/cloud: aws
129+
test.kops.k8s.io/distro: u2404
130+
test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
131+
test.kops.k8s.io/k8s_version: '1.35'
132+
test.kops.k8s.io/kops_channel: alpha
133+
test.kops.k8s.io/kops_version: latest
134+
test.kops.k8s.io/networking: calico
135+
testgrid-dashboards: kops-distro-u2404, kops-k8s-1.35, kops-latest, kops-versions, sig-cluster-lifecycle-kops
136+
testgrid-days-of-results: '11'
137+
testgrid-tab-name: kops-pipeline-updown-kops135
138+
72139
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.34", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
73140
- name: e2e-kops-pipeline-updown-kops134
74141
cron: '19 0-23/1 * * *'

0 commit comments

Comments
 (0)