Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kops - Migrate remaining upgrade jobs to k8s infra prow clusters #32885

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Kops - Migrate remaining upgrade jobs to k8s infra prow clusters #32885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c804167
Upgrade AMIs
rifelpet Jul 2, 2024
23fac18
Bump COS images
rifelpet Jul 2, 2024
94a7631
Migrate remaining upgrade jobs to k8s infra prow clusters
rifelpet Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions config/jobs/kubernetes/kops/build_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--set=spec.nodeProblemDetector.enabled=true",
"--gce-service-account=default",
],
Expand Down Expand Up @@ -1023,7 +1023,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--set=spec.networking.networkID=default",
"--gce-service-account=default",
],
Expand Down Expand Up @@ -1059,7 +1059,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--set=spec.kubeAPIServer.logLevel=4",
"--set=spec.kubeAPIServer.auditLogMaxSize=2000000000",
"--set=spec.kubeAPIServer.enableAggregatorRouting=true",
Expand Down Expand Up @@ -1182,7 +1182,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--node-count=3",
"--gce-service-account=default",
],
Expand All @@ -1202,7 +1202,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--node-count=3",
"--gce-service-account=default",
],
Expand Down Expand Up @@ -1237,7 +1237,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--node-volume-size=100",
"--gce-service-account=default",
],
Expand Down Expand Up @@ -1300,7 +1300,7 @@ def generate_misc():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--set=spec.kubeAPIServer.logLevel=4",
"--set=spec.kubeAPIServer.auditLogMaxSize=2000000000",
"--set=spec.kubeAPIServer.enableAggregatorRouting=true",
Expand Down Expand Up @@ -1523,11 +1523,6 @@ def shorten(version):
'KOPS_TEMPLATE': 'tests/e2e/templates/many-addons.yaml.tmpl',
'KOPS_CONTROL_PLANE_SIZE': '3',
}
build_cluster = 'k8s-infra-kops-prow-build'
# Older k/k builds dont have new enough aws-sdk-go versions to support
# running their e2e.test binary from community-owned EKS clusters.
if re.match(r'v1\.2[4-6]', k8s_a):
build_cluster = 'default'

results.append(
build_test(name_override=job_name,
Expand All @@ -1540,7 +1535,7 @@ def shorten(version):
test_timeout_minutes=120,
scenario='upgrade-ab',
env=env,
build_cluster=build_cluster,
build_cluster='k8s-infra-kops-prow-build',
)
)
results.append(
Expand All @@ -1554,7 +1549,7 @@ def shorten(version):
runs_per_day=runs_per_day,
scenario='upgrade-ab',
env=addonsenv,
build_cluster=build_cluster,
build_cluster='k8s-infra-kops-prow-build',
)
)

Expand Down Expand Up @@ -2313,7 +2308,7 @@ def generate_presubmits_e2e():
k8s_version="ci",
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--node-volume-size=100",
"--gce-service-account=default",
],
Expand All @@ -2334,7 +2329,7 @@ def generate_presubmits_e2e():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--node-volume-size=100",
"--gce-service-account=default",
],
Expand All @@ -2352,7 +2347,7 @@ def generate_presubmits_e2e():
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
"--image=cos-cloud/cos-105-17412-156-49",
"--image=cos-cloud/cos-105-17412-370-67",
"--set=spec.networking.networkID=default",
"--gce-service-account=default",
],
Expand Down
12 changes: 6 additions & 6 deletions config/jobs/kubernetes/kops/kops-periodics-conformance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240614' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240701' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.29/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable-1.29.txt \
--test=kops \
Expand Down Expand Up @@ -98,7 +98,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240614' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240701' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.29/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable-1.29.txt \
--test=kops \
Expand Down Expand Up @@ -164,7 +164,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240614' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240701' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.28/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable-1.28.txt \
--test=kops \
Expand Down Expand Up @@ -230,7 +230,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240614' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240701' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.28/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable-1.28.txt \
--test=kops \
Expand Down Expand Up @@ -296,7 +296,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240614' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240701' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.27/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable-1.27.txt \
--test=kops \
Expand Down Expand Up @@ -362,7 +362,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240614' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240701' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.27/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable-1.27.txt \
--test=kops \
Expand Down
16 changes: 8 additions & 8 deletions config/jobs/kubernetes/kops/kops-periodics-distros.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='136693071363/debian-12-amd64-20240507-1740' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='136693071363/debian-12-amd64-20240701-1795' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -352,7 +352,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240614' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240701' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -416,7 +416,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240614' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240701' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -480,7 +480,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20240606' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20240701.1' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -544,7 +544,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20240606' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20240701.1' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -608,7 +608,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240610.1-x86_64-gp2' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240620.0-x86_64-gp2' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -672,7 +672,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='137112412989/al2023-ami-2023.4.20240611.0-kernel-6.1-x86_64' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='137112412989/al2023-ami-2023.5.20240701.0-kernel-6.1-x86_64' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--test=kops \
Expand Down Expand Up @@ -928,7 +928,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='075585003325/Flatcar-beta-3941.1.0-hvm' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='075585003325/Flatcar-beta-3975.1.0-hvm' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--validation-wait=20m \
Expand Down
Loading