Skip to content

Commit d18a219

Browse files
authored
Merge pull request #33895 from rifelpet/dev
Update upgrade jobs to use Kops 1.30.3
2 parents 06c1dfe + cf5d2fa commit d18a219

File tree

7 files changed

+72
-72
lines changed

7 files changed

+72
-72
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ def generate_upgrades():
14461446

14471447
kops28 = 'v1.28.7'
14481448
kops29 = 'v1.29.2'
1449-
kops30 = 'v1.30.1'
1449+
kops30 = 'v1.30.3'
14501450

14511451
versions_list = [
14521452
# kops k8s kops k8s

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

Lines changed: 2 additions & 2 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-20241111-1928' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
99+
--create-args="--image='136693071363/debian-11-amd64-20241202-1949' --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-20241125-1942' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
163+
--create-args="--image='136693071363/debian-12-amd64-20241201-1948' --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 \

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ periodics:
300300
-v 2 \
301301
--up --down \
302302
--cloud-provider=aws \
303-
--create-args="--image='136693071363/debian-11-amd64-20241111-1928' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
303+
--create-args="--image='136693071363/debian-11-amd64-20241202-1949' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
304304
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
305305
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
306306
--test=kops \

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ periodics:
309309
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
310310
env:
311311
- name: KOPS_VERSION_A
312-
value: "v1.30.1"
312+
value: "v1.30.3"
313313
- name: K8S_VERSION_A
314314
value: "v1.30.4"
315315
- name: KOPS_VERSION_B
@@ -379,7 +379,7 @@ periodics:
379379
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
380380
env:
381381
- name: KOPS_VERSION_A
382-
value: "v1.30.1"
382+
value: "v1.30.3"
383383
- name: K8S_VERSION_A
384384
value: "v1.30.4"
385385
- name: KOPS_VERSION_B
@@ -805,7 +805,7 @@ periodics:
805805
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
806806
env:
807807
- name: KOPS_VERSION_A
808-
value: "v1.30.1"
808+
value: "v1.30.3"
809809
- name: K8S_VERSION_A
810810
value: "v1.26.0"
811811
- name: KOPS_VERSION_B
@@ -875,7 +875,7 @@ periodics:
875875
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
876876
env:
877877
- name: KOPS_VERSION_A
878-
value: "v1.30.1"
878+
value: "v1.30.3"
879879
- name: K8S_VERSION_A
880880
value: "v1.26.0"
881881
- name: KOPS_VERSION_B
@@ -951,7 +951,7 @@ periodics:
951951
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
952952
env:
953953
- name: KOPS_VERSION_A
954-
value: "v1.30.1"
954+
value: "v1.30.3"
955955
- name: K8S_VERSION_A
956956
value: "v1.27.0"
957957
- name: KOPS_VERSION_B
@@ -1021,7 +1021,7 @@ periodics:
10211021
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
10221022
env:
10231023
- name: KOPS_VERSION_A
1024-
value: "v1.30.1"
1024+
value: "v1.30.3"
10251025
- name: K8S_VERSION_A
10261026
value: "v1.27.0"
10271027
- name: KOPS_VERSION_B
@@ -1097,7 +1097,7 @@ periodics:
10971097
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
10981098
env:
10991099
- name: KOPS_VERSION_A
1100-
value: "v1.30.1"
1100+
value: "v1.30.3"
11011101
- name: K8S_VERSION_A
11021102
value: "v1.28.0"
11031103
- name: KOPS_VERSION_B
@@ -1167,7 +1167,7 @@ periodics:
11671167
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
11681168
env:
11691169
- name: KOPS_VERSION_A
1170-
value: "v1.30.1"
1170+
value: "v1.30.3"
11711171
- name: K8S_VERSION_A
11721172
value: "v1.28.0"
11731173
- name: KOPS_VERSION_B
@@ -1243,7 +1243,7 @@ periodics:
12431243
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
12441244
env:
12451245
- name: KOPS_VERSION_A
1246-
value: "v1.30.1"
1246+
value: "v1.30.3"
12471247
- name: K8S_VERSION_A
12481248
value: "v1.29.0"
12491249
- name: KOPS_VERSION_B
@@ -1313,7 +1313,7 @@ periodics:
13131313
- ./tests/e2e/scenarios/upgrade-ab/run-test.sh
13141314
env:
13151315
- name: KOPS_VERSION_A
1316-
value: "v1.30.1"
1316+
value: "v1.30.3"
13171317
- name: K8S_VERSION_A
13181318
value: "v1.29.0"
13191319
- name: KOPS_VERSION_B

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ presubmits:
102102
-v 2 \
103103
--up --build --down \
104104
--cloud-provider=aws \
105-
--create-args="--image='136693071363/debian-11-amd64-20241111-1928' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
105+
--create-args="--image='136693071363/debian-11-amd64-20241202-1949' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
106106
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
107107
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
108108
--test=kops \
@@ -169,7 +169,7 @@ presubmits:
169169
-v 2 \
170170
--up --build --down \
171171
--cloud-provider=aws \
172-
--create-args="--image='136693071363/debian-12-amd64-20241125-1942' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
172+
--create-args="--image='136693071363/debian-12-amd64-20241201-1948' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
173173
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
174174
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
175175
--test=kops \

config/jobs/kubernetes/kops/pinned.list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
aws://images/137112412989/al2023-ami-2*-kernel-6.1-x86_64:x86_64=137112412989/al2023-ami-2023.6.20241121.0-kernel-6.1-x86_64
22
aws://images/137112412989/amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2:x86_64=137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20241113.1-x86_64-gp2
33
aws://images/136693071363/debian-10-amd64-*:x86_64=136693071363/debian-10-amd64-20240703-1797
4-
aws://images/136693071363/debian-11-amd64-*:x86_64=136693071363/debian-11-amd64-20241111-1928
5-
aws://images/136693071363/debian-12-amd64-*:x86_64=136693071363/debian-12-amd64-20241125-1942
4+
aws://images/136693071363/debian-11-amd64-*:x86_64=136693071363/debian-11-amd64-20241202-1949
5+
aws://images/136693071363/debian-12-amd64-*:x86_64=136693071363/debian-12-amd64-20241201-1948
66
aws://images/075585003325/Flatcar-beta-*-hvm:x86_64=075585003325/Flatcar-beta-4116.1.0-hvm
77
aws://images/075585003325/Flatcar-beta-*-hvm:arm64=075585003325/Flatcar-beta-4116.1.0-arm64-hvm
88
aws://images/309956199498/RHEL-8.*_HVM-*-x86_64-*:x86_64=309956199498/RHEL-8.9.0_HVM-20240327-x86_64-4-Hourly2-GP3

0 commit comments

Comments
 (0)