Skip to content

Commit 36f8375

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #31677 from borg-land/kubeup-to-kops-14
Fix some kops e2e jobs
2 parents ff82a14 + ec0f8c8 commit 36f8375

12 files changed

+238
-238
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ def generate_misc():
10371037
"--set=spec.kubeAPIServer.auditLogPath=/var/log/kube-apiserver-audit.log",
10381038
],
10391039
focus_regex=r'\[Conformance\]',
1040-
skip_regex=r'should.serve.endpoints.on.same.port.and.different.protocols',
1040+
skip_regex=r'should.serve.endpoints.on.same.port.and.different.protocols|same.hostPort.but.different.hostIP.and.protocol', # pylint: disable=line-too-long
10411041
# https://github.com/cilium/cilium/pull/29524
10421042
test_timeout_minutes=200,
10431043
test_parallelism=1, # serial tests
@@ -1506,25 +1506,25 @@ def generate_presubmits_scale():
15061506
}
15071507
),
15081508
presubmit_test(
1509-
name='presubmit-kops-gce-scale-calico-using-cl2',
1509+
name='presubmit-kops-gce-scale-ipalias-using-cl2',
15101510
scenario='scalability',
15111511
build_cluster="k8s-infra-prow-build",
15121512
# only helps with setting the right anotation test.kops.k8s.io/networking
1513-
networking='kubenet',
1513+
networking='gce',
15141514
cloud="gce",
15151515
always_run=False,
15161516
artifacts='$(ARTIFACTS)',
15171517
test_timeout_minutes=450,
15181518
use_preset_for_account_creds='preset-aws-credential-boskos-scale-001-kops',
15191519
env={
1520-
'CNI_PLUGIN': "calico",
1520+
'CNI_PLUGIN': "gce",
15211521
'KUBE_NODE_COUNT': "5000",
15221522
'CL2_LOAD_TEST_THROUGHPUT': "50",
15231523
'CL2_DELETE_TEST_THROUGHPUT': "50",
15241524
'CL2_RATE_LIMIT_POD_CREATION': "false",
15251525
'NODE_MODE': "master",
15261526
'CONTROL_PLANE_COUNT': "1",
1527-
'CONTROL_PLANE_SIZE': "e2-standard-32",
1527+
'CONTROL_PLANE_SIZE': "c3-standard-88",
15281528
'PROMETHEUS_SCRAPE_KUBE_PROXY': "true",
15291529
'CL2_ENABLE_DNS_PROGRAMMING': "true",
15301530
'CL2_ENABLE_API_AVAILABILITY_MEASUREMENT': "true",
@@ -1542,21 +1542,21 @@ def generate_presubmits_scale():
15421542
}
15431543
),
15441544
presubmit_test(
1545-
name='presubmit-kops-gce-small-scale-calico-using-cl2',
1545+
name='presubmit-kops-gce-small-scale-ipalias-using-cl2',
15461546
scenario='scalability',
15471547
build_cluster="k8s-infra-prow-build",
15481548
# only helps with setting the right anotation test.kops.k8s.io/networking
1549-
networking='calico',
1549+
networking='gce',
15501550
cloud="gce",
15511551
always_run=False,
15521552
artifacts='$(ARTIFACTS)',
15531553
test_timeout_minutes=450,
15541554
env={
1555-
'CNI_PLUGIN': "calico",
1555+
'CNI_PLUGIN': "gce",
15561556
'KUBE_NODE_COUNT': "500",
15571557
'CL2_SCHEDULER_THROUGHPUT_THRESHOLD': "20",
15581558
'CONTROL_PLANE_COUNT': "1",
1559-
'CONTROL_PLANE_SIZE': "e2-standard-32",
1559+
'CONTROL_PLANE_SIZE': "c3-standard-88",
15601560
'CL2_LOAD_TEST_THROUGHPUT': "50",
15611561
'CL2_DELETE_TEST_THROUGHPUT': "50",
15621562
'CL2_RATE_LIMIT_POD_CREATION': "false",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ periodics:
3232
-v 2 \
3333
--up --down \
3434
--cloud-provider=aws \
35-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20231207' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
35+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240119.1' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
3636
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.28/latest-ci-updown-green.txt \
3737
--kubernetes-version=https://dl.k8s.io/release/stable-1.28.txt \
3838
--test=kops \
@@ -98,7 +98,7 @@ periodics:
9898
-v 2 \
9999
--up --down \
100100
--cloud-provider=aws \
101-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20231207' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
101+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240119.1' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
102102
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.28/latest-ci-updown-green.txt \
103103
--kubernetes-version=https://dl.k8s.io/release/stable-1.28.txt \
104104
--test=kops \
@@ -164,7 +164,7 @@ periodics:
164164
-v 2 \
165165
--up --down \
166166
--cloud-provider=aws \
167-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20231207' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
167+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240119.1' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
168168
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.27/latest-ci-updown-green.txt \
169169
--kubernetes-version=https://dl.k8s.io/release/stable-1.27.txt \
170170
--test=kops \
@@ -230,7 +230,7 @@ periodics:
230230
-v 2 \
231231
--up --down \
232232
--cloud-provider=aws \
233-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20231207' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
233+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240119.1' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
234234
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.27/latest-ci-updown-green.txt \
235235
--kubernetes-version=https://dl.k8s.io/release/stable-1.27.txt \
236236
--test=kops \

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ periodics:
352352
-v 2 \
353353
--up --down \
354354
--cloud-provider=aws \
355-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20231207' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
355+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240119.1' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
356356
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
357357
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
358358
--test=kops \
@@ -416,7 +416,7 @@ periodics:
416416
-v 2 \
417417
--up --down \
418418
--cloud-provider=aws \
419-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20231207' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
419+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240119.1' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
420420
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
421421
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
422422
--test=kops \
@@ -544,7 +544,7 @@ periodics:
544544
-v 2 \
545545
--up --down \
546546
--cloud-provider=aws \
547-
--create-args="--image='137112412989/al2023-ami-2023.3.20240108.0-kernel-6.1-x86_64' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
547+
--create-args="--image='137112412989/al2023-ami-2023.3.20240117.0-kernel-6.1-x86_64' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
548548
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
549549
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
550550
--test=kops \
@@ -800,7 +800,7 @@ periodics:
800800
-v 2 \
801801
--up --down \
802802
--cloud-provider=aws \
803-
--create-args="--image='075585003325/Flatcar-beta-3760.1.1-hvm' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
803+
--create-args="--image='075585003325/Flatcar-beta-3815.1.0-hvm' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
804804
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
805805
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
806806
--validation-wait=20m \

0 commit comments

Comments
 (0)