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

kOps: Use Ubuntu 20.04 for AWS VPC CNI tests #28006

Merged
merged 1 commit into from
Nov 15, 2022
Merged

kOps: Use Ubuntu 20.04 for AWS VPC CNI tests #28006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 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 @@ -816,8 +816,12 @@ def generate_network_plugins():
k8s_version = 'stable'
if plugin == 'weave':
k8s_version = '1.22'
distro = 'u2204'
if plugin == 'amazon-vpc':
distro = 'u2004'
results.append(
build_test(
distro=distro,
k8s_version=k8s_version,
kops_channel='alpha',
name_override=f"kops-aws-cni-{plugin}",
Expand Down Expand Up @@ -1005,14 +1009,17 @@ def generate_presubmits_network_plugins():
k8s_version = 'stable'
networking_arg = plugin
optional = False
distro = 'u2204'
if plugin == 'amazonvpc':
distro = 'u2004'
optional = True
if plugin == 'kuberouter':
networking_arg = 'kube-router'
if plugin == 'weave':
k8s_version = '1.22'
results.append(
presubmit_test(
distro=distro,
k8s_version=k8s_version,
kops_channel='alpha',
name=f"pull-kops-e2e-cni-{plugin}",
Expand Down
8 changes: 4 additions & 4 deletions config/jobs/kubernetes/kops/kops-periodics-network-plugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 9 jobs, total of 189 runs per week
periodics:

# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2204", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "amazonvpc"}
# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "amazonvpc"}
- name: e2e-kops-aws-cni-amazon-vpc
cron: '15 3-23/8 * * *'
labels:
Expand Down Expand Up @@ -31,7 +31,7 @@ periodics:
-v 2 \
--up --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20221101.1' --channel=alpha --networking=amazonvpc --container-runtime=containerd --node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018' --channel=alpha --networking=amazonvpc --container-runtime=containerd --node-size=t3.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://storage.googleapis.com/kubernetes-release/release/stable.txt \
--test=kops \
Expand All @@ -56,13 +56,13 @@ periodics:
annotations:
test.kops.k8s.io/cloud: aws
test.kops.k8s.io/container_runtime: containerd
test.kops.k8s.io/distro: u2204
test.kops.k8s.io/distro: u2004
test.kops.k8s.io/extra_flags: --node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery
test.kops.k8s.io/k8s_version: stable
test.kops.k8s.io/kops_channel: alpha
test.kops.k8s.io/kops_version: ''
test.kops.k8s.io/networking: amazonvpc
testgrid-dashboards: google-aws, kops-distro-u2204, kops-k8s-stable, kops-latest, kops-network-plugins, sig-cluster-lifecycle-kops
testgrid-dashboards: google-aws, kops-distro-u2004, kops-k8s-stable, kops-latest, kops-network-plugins, sig-cluster-lifecycle-kops
testgrid-days-of-results: '90'
testgrid-tab-name: kops-aws-cni-amazon-vpc

Expand Down
6 changes: 3 additions & 3 deletions config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
presubmits:
kubernetes/kops:

# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2204", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"}
# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"}
- name: pull-kops-e2e-cni-amazonvpc
branches:
- master
Expand Down Expand Up @@ -35,7 +35,7 @@ presubmits:
-v 2 \
--up --build --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20221101.1' --channel=alpha --networking=amazonvpc --container-runtime=containerd --node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018' --channel=alpha --networking=amazonvpc --container-runtime=containerd --node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery" \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
--test=kops \
Expand All @@ -60,7 +60,7 @@ presubmits:
annotations:
test.kops.k8s.io/cloud: aws
test.kops.k8s.io/container_runtime: containerd
test.kops.k8s.io/distro: u2204
test.kops.k8s.io/distro: u2004
test.kops.k8s.io/extra_flags: --node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery
test.kops.k8s.io/k8s_version: stable
test.kops.k8s.io/kops_channel: alpha
Expand Down