Skip to content

Commit 563dcaf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #29914 from hakman/remove_weave
kOps: Remove tests for Weave Net
2 parents 55ee5e3 + e7f1e34 commit 563dcaf

11 files changed

+173
-307
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -917,13 +917,11 @@ def generate_presubmits_distros():
917917
#######################################
918918
def generate_network_plugins():
919919

920-
plugins = ['amazon-vpc', 'calico', 'canal', 'cilium', 'cilium-etcd', 'cilium-eni', 'flannel', 'kopeio', 'kuberouter', 'weave'] # pylint: disable=line-too-long
920+
plugins = ['amazon-vpc', 'calico', 'canal', 'cilium', 'cilium-etcd', 'cilium-eni', 'flannel', 'kopeio', 'kuberouter'] # pylint: disable=line-too-long
921921
results = []
922922
for plugin in plugins:
923923
networking_arg = plugin.replace('amazon-vpc', 'amazonvpc').replace('kuberouter', 'kube-router') # pylint: disable=line-too-long
924924
k8s_version = 'stable'
925-
if plugin == 'weave':
926-
k8s_version = '1.22'
927925
distro = 'u2204'
928926
if plugin == 'amazon-vpc':
929927
distro = 'u2004'
@@ -1151,7 +1149,6 @@ def generate_presubmits_network_plugins():
11511149
'cilium-eni': r'^(upup\/models\/cloudup\/resources\/addons\/networking\.cilium\.io\/|pkg\/model\/(components\/containerd|firewall|components\/cilium|iam\/iam_builder)\.go|nodeup\/pkg\/model\/(context|networking\/cilium)\.go)', # pylint: disable=line-too-long
11521150
'flannel': r'^(upup\/models\/cloudup\/resources\/addons\/networking\.flannel\/|pkg\/model\/components\/containerd\.go)', # pylint: disable=line-too-long
11531151
'kuberouter': r'^(upup\/models\/cloudup\/resources\/addons\/networking\.kuberouter\/|pkg\/model\/components\/containerd\.go)', # pylint: disable=line-too-long
1154-
'weave': r'^(upup\/models\/cloudup\/resources\/addons\/networking\.weave\/)' # pylint: disable=line-too-long
11551152
}
11561153
supports_ipv6 = {'amazonvpc', 'calico', 'cilium'}
11571154
results = []
@@ -1166,9 +1163,6 @@ def generate_presubmits_network_plugins():
11661163
if plugin == 'kuberouter':
11671164
networking_arg = 'kube-router'
11681165
optional = True
1169-
if plugin == 'weave':
1170-
distro = 'u2204'
1171-
k8s_version = '1.22'
11721166
extra_flags = ['--node-size=t3.large']
11731167
if 'arm64' in distro:
11741168
extra_flags = ["--node-size=t4g.large"]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ periodics:
3131
-v 2 \
3232
--up --down \
3333
--cloud-provider=aws \
34-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
34+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230623' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
3535
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.26/latest-ci-updown-green.txt \
3636
--kubernetes-version=https://dl.k8s.io/release/stable-1.26.txt \
3737
--test=kops \
@@ -96,7 +96,7 @@ periodics:
9696
-v 2 \
9797
--up --down \
9898
--cloud-provider=aws \
99-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230608' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
99+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230623' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
100100
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.26/latest-ci-updown-green.txt \
101101
--kubernetes-version=https://dl.k8s.io/release/stable-1.26.txt \
102102
--test=kops \
@@ -161,7 +161,7 @@ periodics:
161161
-v 2 \
162162
--up --down \
163163
--cloud-provider=aws \
164-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
164+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230623' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
165165
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.25/latest-ci-updown-green.txt \
166166
--kubernetes-version=https://dl.k8s.io/release/stable-1.25.txt \
167167
--test=kops \
@@ -226,7 +226,7 @@ periodics:
226226
-v 2 \
227227
--up --down \
228228
--cloud-provider=aws \
229-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230608' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
229+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230623' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery" \
230230
--kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.25/latest-ci-updown-green.txt \
231231
--kubernetes-version=https://dl.k8s.io/release/stable-1.25.txt \
232232
--test=kops \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ periodics:
409409
-v 2 \
410410
--up --down \
411411
--cloud-provider=aws \
412-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
412+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230623' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
413413
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
414414
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
415415
--test=kops \
@@ -472,7 +472,7 @@ periodics:
472472
-v 2 \
473473
--up --down \
474474
--cloud-provider=aws \
475-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230608' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
475+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230623' --channel=alpha --networking=cilium --zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery" \
476476
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
477477
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
478478
--test=kops \

0 commit comments

Comments
 (0)