From 48035e3a7eeb1146495c92a6802b9b5179dab7c2 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi <ken1ohmichi@gmail.com> Date: Wed, 17 May 2023 20:42:33 +0900 Subject: [PATCH] Drop CI jobs related to canal (#10092) * Drop CI jobs related to canal According to the canal github[1] the repo is not maintained over 5 years. In addition, the README says Originally, we thought we might more deeply integrate the two projects (possibly even going as far as a rebranding!). However, over time it became clear that that wasn't really necessary to fulfil our goal of making them work well together. Ultimately, we decided to focus on adding features to both projects rather than doing work just to combine them. So we don't need to run CI jobs related to the canal at this situation. [1]: https://github.com/projectcalico/canal * Update ci.md --- .gitlab-ci/packet.yml | 20 ----- docs/ci.md | 102 +++++++++++----------- tests/files/packet_centos7-canal-ha.yml | 9 -- tests/files/packet_opensuse-canal.yml | 9 -- tests/files/packet_ubuntu16-canal-ha.yml | 8 -- tests/files/packet_ubuntu16-canal-sep.yml | 8 -- 6 files changed, 51 insertions(+), 105 deletions(-) delete mode 100644 tests/files/packet_centos7-canal-ha.yml delete mode 100644 tests/files/packet_opensuse-canal.yml delete mode 100644 tests/files/packet_ubuntu16-canal-ha.yml delete mode 100644 tests/files/packet_ubuntu16-canal-sep.yml diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index db4766de7..844082055 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -91,16 +91,6 @@ packet_fedora35-crio: stage: deploy-part2 when: manual -packet_ubuntu16-canal-ha: - stage: deploy-part2 - extends: .packet_periodic - when: on_success - -packet_ubuntu16-canal-sep: - stage: deploy-special - extends: .packet_pr - when: manual - packet_ubuntu16-flannel-ha: stage: deploy-part2 extends: .packet_pr @@ -178,11 +168,6 @@ packet_fedora36-docker-weave: extends: .packet_pr when: on_success -packet_opensuse-canal: - stage: deploy-part2 - extends: .packet_periodic - when: on_success - packet_opensuse-docker-cilium: stage: deploy-part2 extends: .packet_pr @@ -231,11 +216,6 @@ packet_centos7-multus-calico: extends: .packet_pr when: manual -packet_centos7-canal-ha: - stage: deploy-part2 - extends: .packet_pr - when: manual - packet_fedora36-docker-calico: stage: deploy-part2 extends: .packet_periodic diff --git a/docs/ci.md b/docs/ci.md index 405552590..7f6d5ca2d 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -4,60 +4,60 @@ To generate this Matrix run `./tests/scripts/md-table/main.py` ## containerd -| OS / CNI | calico | canal | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | -|---| --- | --- | --- | --- | --- | --- | --- | --- | --- | -almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | -amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos7 | :white_check_mark: | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | -debian10 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -debian11 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | -fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | -fedora36 | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | -opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu16 | :x: | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | -ubuntu18 | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | -ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | +|---| --- | --- | --- | --- | --- | --- | --- | --- | +almalinux8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | +amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +centos7 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | +debian10 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +debian11 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | +fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | +fedora36 | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | +opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu16 | :x: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | +ubuntu18 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | +ubuntu20 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## crio -| OS / CNI | calico | canal | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | -|---| --- | --- | --- | --- | --- | --- | --- | --- | --- | -almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora36 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu22 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | +|---| --- | --- | --- | --- | --- | --- | --- | --- | +almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora36 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu20 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu22 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## docker -| OS / CNI | calico | canal | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | -|---| --- | --- | --- | --- | --- | --- | --- | --- | --- | -almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian10 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora35 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora36 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | -opensuse | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | -ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | +|---| --- | --- | --- | --- | --- | --- | --- | --- | +almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian10 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora35 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora36 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | +opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | +ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/tests/files/packet_centos7-canal-ha.yml b/tests/files/packet_centos7-canal-ha.yml deleted file mode 100644 index 94a5f0e41..000000000 --- a/tests/files/packet_centos7-canal-ha.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# Instance settings -cloud_image: centos-7 -mode: ha - -# Kubespray settings -calico_datastore: etcd -kube_network_plugin: canal -auto_renew_certificates: true diff --git a/tests/files/packet_opensuse-canal.yml b/tests/files/packet_opensuse-canal.yml deleted file mode 100644 index 67f38127a..000000000 --- a/tests/files/packet_opensuse-canal.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# Instance settings -cloud_image: opensuse-leap-15 -mode: default - -# Kubespray settings -calico_datastore: etcd -kube_network_plugin: canal -auto_renew_certificates: true diff --git a/tests/files/packet_ubuntu16-canal-ha.yml b/tests/files/packet_ubuntu16-canal-ha.yml deleted file mode 100644 index 1a8eb2dbf..000000000 --- a/tests/files/packet_ubuntu16-canal-ha.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-1604 -mode: ha - -# Kubespray settings -calico_datastore: etcd -kube_network_plugin: canal diff --git a/tests/files/packet_ubuntu16-canal-sep.yml b/tests/files/packet_ubuntu16-canal-sep.yml deleted file mode 100644 index e2e165ee8..000000000 --- a/tests/files/packet_ubuntu16-canal-sep.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-1604 -mode: separate - -# Kubespray settings -calico_datastore: etcd -kube_network_plugin: canal -- GitLab