diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 472ae99a30dda211132f66ba72dd59b2f522c983..de02cd98981ed262574a2b771507e5dfcd0b3308 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -169,11 +169,6 @@ packet_opensuse-docker-cilium:
extends: .packet_pr
when: manual
-packet_ubuntu18-ovn4nfv:
- stage: deploy-part2
- extends: .packet_periodic
- when: on_success
-
# ### MANUAL JOBS
packet_ubuntu16-docker-weave-sep:
diff --git a/README.md b/README.md
index 0a541d472101b0c3f6c49b565d8419af62aeeee2..ffcace4396317b7ff4609eaba85168f0548b5518 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,6 @@ Note: Upstart/SysV init based OS types are not supported.
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.8.1
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.3.2
- [multus](https://github.com/intel/multus-cni) v3.8
- - [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
- [weave](https://github.com/weaveworks/weave) v2.8.1
- Application
- [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
@@ -195,8 +194,6 @@ You can choose between 10 network plugins. (default: `calico`, except Vagrant us
- [cilium](http://docs.cilium.io/en/latest/): layer 3/4 networking (as well as layer 7 to protect and secure application protocols), supports dynamic insertion of BPF bytecode into the Linux kernel to implement security services, networking and visibility logic.
-- [ovn4nfv](docs/ovn4nfv.md): [ovn4nfv-k8s-plugins](https://github.com/opnfv/ovn4nfv-k8s-plugin) is the network controller, OVS agent and CNI server to offer basic SFC and OVN overlay networking.
-
- [weave](docs/weave.md): Weave is a lightweight container overlay network that doesn't require an external K/V database cluster.
(Please refer to `weave` [troubleshooting documentation](https://www.weave.works/docs/net/latest/troubleshooting/)).
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 404c439cef0d940f591c01168e25ae6689a53e80..b2ca1c51d1fb0f07089e3e8b394046a7c59a600c 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -17,7 +17,6 @@
* [Kube OVN](docs/kube-ovn.md)
* [Weave](docs/weave.md)
* [Multus](docs/multus.md)
- * [OVN4NFV](docs/ovn4nfv.md)
* Ingress
* [ALB Ingress](docs/ingress_controller/alb_ingress_controller.md)
* [MetalLB](docs/metallb.md)
diff --git a/docs/ansible.md b/docs/ansible.md
index cc51d261729c7a0f7cb7f6aa82da42040b128d3e..7aca19e0183f6aa834a96c6fbbd82ad232c2ee95 100644
--- a/docs/ansible.md
+++ b/docs/ansible.md
@@ -179,7 +179,6 @@ The following tags are defined in playbooks:
| node-webhook | Tasks linked to webhook (grating access to resources)
| nvidia_gpu | Enable nvidia accelerator for runtimes
| oci | Cloud provider: oci
-| ovn4nfv | Network plugin ovn4nfv
| persistent_volumes | Configure csi volumes
| persistent_volumes_aws_ebs_csi | Configuring csi driver: aws-ebs
| persistent_volumes_cinder_csi | Configuring csi driver: cinder
diff --git a/docs/ci.md b/docs/ci.md
index bb97cedfdc05b839c8e8336a6bccf8393e56e7dd..2c8defcc8bf10186c9abaf0598f26d98a69baf85 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -4,54 +4,54 @@ To generate this Matrix run `./tests/scripts/md-table/main.py`
## containerd
-| OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | ovn4nfv | weave |
-|---| --- | --- | --- | --- | --- | --- | --- | --- | --- |
-amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: |
-centos8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: |
-debian10 | :white_check_mark: | :x: | :white_check_mark: | :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: | :white_check_mark: | :x: | :x: |
-fedora34 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: |
-fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
-opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-oracle7 | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-ubuntu16 | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: |
-ubuntu18 | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: |
-ubuntu20 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
+| OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | weave |
+|---| --- | --- | --- | --- | --- | --- | --- | --- |
+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: | :x: |
+centos8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
+debian10 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
+debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: |
+fedora34 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
+fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
+opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
+oracle7 | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
+ubuntu16 | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: |
+ubuntu18 | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: |
+ubuntu20 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: |
## crio
-| OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | ovn4nfv | weave |
-|---| --- | --- | --- | --- | --- | --- | --- | --- | --- |
-amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos8 | :white_check_mark: | :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: |
-fedora34 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-oracle7 | :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: |
+| OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | weave |
+|---| --- | --- | --- | --- | --- | --- | --- | --- |
+amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+centos8 | :white_check_mark: | :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: |
+fedora34 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+oracle7 | :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: |
## docker
-| OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | ovn4nfv | weave |
-|---| --- | --- | --- | --- | --- | --- | --- | --- | --- |
-amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
-centos8 | :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: |
-fedora34 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
-fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-opensuse | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
-oracle7 | :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: |
+| OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | weave |
+|---| --- | --- | --- | --- | --- | --- | --- | --- |
+amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
+centos8 | :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: |
+fedora34 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
+fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+opensuse | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
+oracle7 | :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: |
diff --git a/docs/ovn4nfv.md b/docs/ovn4nfv.md
deleted file mode 100644
index 9106f60327bfc40cfca7a659ac21e87ba8efc3f7..0000000000000000000000000000000000000000
--- a/docs/ovn4nfv.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# OVN4NFV-k8S-Plugin
-
-Intro to [ovn4nfv-k8s-plugin](https://github.com/opnfv/ovn4nfv-k8s-plugin)
-
-## How to use it
-
-* Enable ovn4nfv in `group_vars/k8s_cluster/k8s_cluster.yml`
-
-```yml
-...
-kube_network_plugin: ovn4nfv
-...
-```
-
-## Verifying ovn4nfv kube network plugin
-
-* ovn4nfv install ovn control plan in the master and ovn daemonset in all nodes
-* Network function Networking(nfn) operator is install in the master and nfn agent is installed in all the node
-* ovn4nfv install `ovn4nfvk8s-cni` cni shim binary in `/opt/cni/bin/` and nfn agent act as the cni server
-* All ovn4nfv pods are installed in the kube-system
-
-```ShellSession
-# From K8s client
-# kubectl get pods -n kube-system -l app=ovn-control-plane -o wide
-NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
-ovn-control-plane-5f8b7bcc65-w759g 1/1 Running 0 3d18h 192.168.121.25 master <none> <none>
-
-# kubectl get pods -n kube-system -l app=ovn-controller -o wide
-NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
-ovn-controller-54zzj 1/1 Running 0 3d18h 192.168.121.24 minion01 <none> <none>
-ovn-controller-7cljt 1/1 Running 0 3d18h 192.168.121.25 master <none> <none>
-ovn-controller-cx46g 1/1 Running 0 3d18h 192.168.121.15 minion02 <none> <none>
-
-# kubectl get pods -n kube-system -l name=nfn-operator -o wide
-NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
-nfn-operator-6dc44dbf48-xk9zl 1/1 Running 0 3d18h 192.168.121.25 master <none> <none>
-
-# kubectl get pods -n kube-system -l app=nfn-agent -o wide
-NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
-nfn-agent-dzlpp 1/1 Running 0 3d18h 192.168.121.15 minion02 <none> <none>
-nfn-agent-jcdbn 1/1 Running 0 3d18h 192.168.121.25 master <none> <none>
-nfn-agent-lrkzk 1/1 Running 0 3d18h 192.168.121.24 minion01 <none> <none>
-
-# kubectl get pods -n kube-system -l app=ovn4nfv -o wide
-NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
-ovn4nfv-cni-5zdz2 1/1 Running 0 3d18h 192.168.121.24 minion01 <none> <none>
-ovn4nfv-cni-k5wjp 1/1 Running 0 3d18h 192.168.121.25 master <none> <none>
-ovn4nfv-cni-t6z5b 1/1 Running 0 3d18h 192.168.121.15 minion02 <none> <none>
-```
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 06c65123a26a780bcea767f0f525eab5ba3293fc..06aece6ecc06964005d9e876240865bcd96a6301 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -87,8 +87,6 @@ cilium_version: "v1.9.11"
kube_ovn_version: "v1.8.1"
kube_router_version: "v1.3.2"
multus_version: "v3.8"
-ovn4nfv_ovn_image_version: "v1.0.0"
-ovn4nfv_k8s_plugin_image_version: "v1.1.0"
helm_version: "v3.7.1"
nerdctl_version: "0.12.1"
krew_version: "v0.4.2"
@@ -623,10 +621,6 @@ kube_router_image_repo: "{{ docker_image_repo }}/cloudnativelabs/kube-router"
kube_router_image_tag: "{{ kube_router_version }}"
multus_image_repo: "{{ github_image_repo }}/k8snetworkplumbingwg/multus-cni"
multus_image_tag: "{{ multus_version }}"
-ovn4nfv_ovn_image_repo: "{{ docker_image_repo }}/integratedcloudnative/ovn-images"
-ovn4nfv_ovn_image_tag: "{{ ovn4nfv_ovn_image_version }}"
-ovn4nfv_k8s_plugin_image_repo: "{{ docker_image_repo }}/integratedcloudnative/ovn4nfv-k8s-plugin"
-ovn4nfv_k8s_plugin_image_tag: "{{ ovn4nfv_k8s_plugin_image_version }}"
nginx_image_repo: "{{ docker_image_repo }}/library/nginx"
nginx_image_tag: 1.19
@@ -1054,15 +1048,6 @@ downloads:
groups:
- k8s_cluster
- ovn4nfv:
- enabled: "{{ kube_network_plugin == 'ovn4nfv' }}"
- container: true
- repo: "{{ ovn4nfv_k8s_plugin_image_repo }}"
- tag: "{{ ovn4nfv_k8s_plugin_image_tag }}"
- sha256: "{{ ovn4nfv_k8s_plugin_digest_checksum|default(None) }}"
- groups:
- - k8s_cluster
-
kube_ovn:
enabled: "{{ kube_network_plugin == 'kube-ovn' }}"
container: true
diff --git a/roles/kubernetes-apps/network_plugin/meta/main.yml b/roles/kubernetes-apps/network_plugin/meta/main.yml
index 00aae5095469d70a491832f2ec7300479fb79a93..976e6ec0e5fab439d4ca71b0a5414722e19c47d8 100644
--- a/roles/kubernetes-apps/network_plugin/meta/main.yml
+++ b/roles/kubernetes-apps/network_plugin/meta/main.yml
@@ -30,11 +30,6 @@ dependencies:
tags:
- kube-router
- - role: kubernetes-apps/network_plugin/ovn4nfv
- when: kube_network_plugin == 'ovn4nfv'
- tags:
- - ovn4nfv
-
- role: kubernetes-apps/network_plugin/multus
when: kube_network_plugin_multus
tags:
diff --git a/roles/kubernetes-apps/network_plugin/ovn4nfv/tasks/main.yml b/roles/kubernetes-apps/network_plugin/ovn4nfv/tasks/main.yml
deleted file mode 100644
index 987ff2949b9613d314d97f6a88f94fc72333ee4a..0000000000000000000000000000000000000000
--- a/roles/kubernetes-apps/network_plugin/ovn4nfv/tasks/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: ovn4nfv-k8s | Start Resources
- kube:
- name: "{{ item.item.name }}"
- kubectl: "{{ bin_dir }}/kubectl"
- filename: "{{ kube_config_dir }}/{{ item.item.file }}"
- state: "latest"
- with_items: "{{ ovn4nfv_node_manifests.results }}"
- when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped
diff --git a/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2 b/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
index 8e15ceae292bba9257eff1c1a271bf4bf9b5ba9f..c4f4cf0440791743ad7c0a1c6e31c11935892c9c 100644
--- a/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
+++ b/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
@@ -38,7 +38,7 @@ KUBELET_ARGS="{{ kubelet_args_base }} {% if node_taints|default([]) %}--register
{% if kubelet_flexvolumes_plugins_dir is defined %}
KUBELET_VOLUME_PLUGIN="--volume-plugin-dir={{ kubelet_flexvolumes_plugins_dir }}"
{% endif %}
-{% if kube_network_plugin is defined and kube_network_plugin in ["calico", "canal", "cni", "flannel", "weave", "cilium", "kube-ovn", "ovn4nfv", "kube-router", "macvlan"] %}
+{% if kube_network_plugin is defined and kube_network_plugin in ["calico", "canal", "cni", "flannel", "weave", "cilium", "kube-ovn", "kube-router", "macvlan"] %}
KUBELET_NETWORK_PLUGIN="--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
{% elif kube_network_plugin is defined and kube_network_plugin == "cloud" %}
KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kubenet"
diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
index 04c6dc7ab132938cb6f63cd6e0c7158fafdbf996..3f453bac61d03dbbc229e05005d65374d69f7b0a 100644
--- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
+++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -30,7 +30,7 @@
- name: Stop if unknown network plugin
assert:
- that: kube_network_plugin in ['calico', 'canal', 'flannel', 'weave', 'cloud', 'cilium', 'cni', 'ovn4nfv','kube-ovn', 'kube-router', 'macvlan']
+ that: kube_network_plugin in ['calico', 'canal', 'flannel', 'weave', 'cloud', 'cilium', 'cni','kube-ovn', 'kube-router', 'macvlan']
msg: "{{ kube_network_plugin }} is not supported"
when:
- kube_network_plugin is defined
diff --git a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
index 312df995af88a78287273d93069a7b5135cd4ea7..0c6ded0f9084be8628ed8cacb2c1b7d30734fe45 100644
--- a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
+++ b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
@@ -78,7 +78,7 @@
- "/opt/cni/bin"
- "/var/lib/calico"
when:
- - kube_network_plugin in ["calico", "weave", "canal", "flannel", "cilium", "kube-ovn", "ovn4nfv", "kube-router", "macvlan"]
+ - kube_network_plugin in ["calico", "weave", "canal", "flannel", "cilium", "kube-ovn", "kube-router", "macvlan"]
- inventory_hostname in groups['k8s_cluster']
tags:
- network
@@ -86,7 +86,6 @@
- calico
- weave
- canal
- - ovn4nfv
- kube-ovn
- kube-router
- bootstrap-os
diff --git a/roles/network_plugin/meta/main.yml b/roles/network_plugin/meta/main.yml
index 5aed5929f32daa15919c163af2de76e44b978a14..49143874d3484357d0d2debe556b24b0419b41bc 100644
--- a/roles/network_plugin/meta/main.yml
+++ b/roles/network_plugin/meta/main.yml
@@ -45,11 +45,6 @@ dependencies:
tags:
- kube-router
- - role: network_plugin/ovn4nfv
- when: kube_network_plugin == 'ovn4nfv'
- tags:
- - ovn4nfv
-
- role: network_plugin/multus
when: kube_network_plugin_multus
tags:
diff --git a/roles/network_plugin/ovn4nfv/defaults/main.yml b/roles/network_plugin/ovn4nfv/defaults/main.yml
deleted file mode 100644
index a7550753dd4afb7b7c1b2b465967733918371dd5..0000000000000000000000000000000000000000
--- a/roles/network_plugin/ovn4nfv/defaults/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-ovn_control_plane_cpu_request: 500m
-ovn_control_plane_memory_request: 300Mi
-ovn_controller_cpu_request: 200m
-ovn_controller_memory_request: 300Mi
-ovn_controller_cpu_limit: 1000m
-ovn_controller_memory_limit: 800Mi
-ovn4nfv_cni_cpu_request: 100m
-ovn4nfv_cni_memory_request: 50Mi
-ovn4nfv_cni_cpu_limit: 100m
-ovn4nfv_cni_memory_limit: 50Mi
-nfn_agent_cpu_request: 100m
-nfn_agent_memory_request: 50Mi
-nfn_agent_cpu_limit: 100m
-nfn_agent_memory_limit: 50Mi
diff --git a/roles/network_plugin/ovn4nfv/tasks/main.yml b/roles/network_plugin/ovn4nfv/tasks/main.yml
deleted file mode 100644
index 26dbd32bdb576daa1638223600cc328a007b71a3..0000000000000000000000000000000000000000
--- a/roles/network_plugin/ovn4nfv/tasks/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: ovn4nfv | Label control-plane node
- command: >-
- {{ bin_dir }}/kubectl label --overwrite node {{ groups['kube_control_plane'] | first }} ovn4nfv-k8s-plugin=ovn-control-plane
- when:
- - inventory_hostname == groups['kube_control_plane'][0]
-
-- name: ovn4nfv | Create ovn4nfv-k8s manifests
- template:
- src: "{{ item.file }}.j2"
- dest: "{{ kube_config_dir }}/{{ item.file }}"
- with_items:
- - {name: ovn-daemonset, file: ovn-daemonset.yml}
- - {name: ovn4nfv-k8s-plugin, file: ovn4nfv-k8s-plugin.yml}
- register: ovn4nfv_node_manifests
diff --git a/roles/network_plugin/ovn4nfv/templates/ovn-daemonset.yml.j2 b/roles/network_plugin/ovn4nfv/templates/ovn-daemonset.yml.j2
deleted file mode 100644
index 2131fe73f0e1f8bf87756f155f5c88b4a30cca63..0000000000000000000000000000000000000000
--- a/roles/network_plugin/ovn4nfv/templates/ovn-daemonset.yml.j2
+++ /dev/null
@@ -1,239 +0,0 @@
----
-kind: Service
-apiVersion: v1
-metadata:
- name: ovn-nb-tcp
- namespace: kube-system
-spec:
- ports:
- - name: ovn-nb-tcp
- protocol: TCP
- port: 6641
- targetPort: 6641
- type: ClusterIP
- selector:
- app: ovn-control-plane
- sessionAffinity: None
-
----
-kind: Service
-apiVersion: v1
-metadata:
- name: ovn-sb-tcp
- namespace: kube-system
-spec:
- ports:
- - name: ovn-sb-tcp
- protocol: TCP
- port: 6642
- targetPort: 6642
- type: ClusterIP
- selector:
- app: ovn-control-plane
- sessionAffinity: None
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- name: ovn-control-plane
- namespace: kube-system
- annotations:
- kubernetes.io/description: |
- OVN control plane deployment using tcp: ovn-northd-tcp, ovn-nb-tcp and ovn-sb-tcp.
-spec:
- replicas: 1
- strategy:
- rollingUpdate:
- maxSurge: 0%
- maxUnavailable: 100%
- type: RollingUpdate
- selector:
- matchLabels:
- app: ovn-control-plane
- template:
- metadata:
- labels:
- app: ovn-control-plane
- spec:
- tolerations:
- - operator: Exists
- effect: NoSchedule
- affinity:
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchLabels:
- app: ovn-control-plane
- topologyKey: kubernetes.io/hostname
- priorityClassName: system-cluster-critical
- hostNetwork: true
- containers:
- - name: ovn-control-plane
- image: {{ ovn4nfv_ovn_image_repo }}:{{ ovn4nfv_ovn_image_tag }}
- imagePullPolicy: {{ k8s_image_pull_policy }}
- command: ["ovn4nfv-k8s", "start_ovn_control_plane"]
- securityContext:
- capabilities:
- add: ["SYS_NICE"]
- env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- - name: POD_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- resources:
- requests:
- cpu: {{ ovn_control_plane_cpu_request }}
- memory: {{ ovn_control_plane_memory_request }}
- volumeMounts:
- - mountPath: /var/run/openvswitch
- name: host-run-ovs
- - mountPath: /var/run/ovn
- name: host-run-ovn
- - mountPath: /sys
- name: host-sys
- readOnly: true
- - mountPath: /etc/openvswitch
- name: host-config-openvswitch
- - mountPath: /var/log/openvswitch
- name: host-log-ovs
- - mountPath: /var/log/ovn
- name: host-log-ovn
- readinessProbe:
- exec:
- command: ["ovn4nfv-k8s", "check_ovn_control_plane"]
- periodSeconds: 3
- livenessProbe:
- exec:
- command: ["ovn4nfv-k8s", "check_ovn_control_plane"]
- initialDelaySeconds: 30
- periodSeconds: 7
- failureThreshold: 5
- nodeSelector:
- kubernetes.io/os: "linux"
- ovn4nfv-k8s-plugin: ovn-control-plane
- volumes:
- - name: host-run-ovs
- hostPath:
- path: /run/openvswitch
- - name: host-run-ovn
- hostPath:
- path: /run/ovn
- - name: host-sys
- hostPath:
- path: /sys
- - name: host-config-openvswitch
- hostPath:
- path: /etc/origin/openvswitch
- - name: host-log-ovs
- hostPath:
- path: /var/log/openvswitch
- - name: host-log-ovn
- hostPath:
- path: /var/log/ovn
-
----
-kind: DaemonSet
-apiVersion: apps/v1
-metadata:
- name: ovn-controller
- namespace: kube-system
- annotations:
- kubernetes.io/description: |
- OVN controller: Start ovsdb-server & ovs-vswitchd components, and ovn controller
-spec:
- selector:
- matchLabels:
- app: ovn-controller
- updateStrategy:
- type: OnDelete
- template:
- metadata:
- labels:
- app: ovn-controller
- spec:
- tolerations:
- - operator: Exists
- effect: NoSchedule
- priorityClassName: system-cluster-critical
- hostNetwork: true
- hostPID: true
- containers:
- - name: ovn-controller
- image: {{ ovn4nfv_ovn_image_repo }}:{{ ovn4nfv_ovn_image_tag }}
- imagePullPolicy: {{ k8s_image_pull_policy }}
- command: ["ovn4nfv-k8s", "start_ovn_controller"]
- securityContext:
- runAsUser: 0
- privileged: true
- env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- volumeMounts:
- - mountPath: /lib/modules
- name: host-modules
- readOnly: true
- - mountPath: /var/run/openvswitch
- name: host-run-ovs
- - mountPath: /var/run/ovn
- name: host-run-ovn
- - mountPath: /sys
- name: host-sys
- readOnly: true
- - mountPath: /etc/openvswitch
- name: host-config-openvswitch
- - mountPath: /var/log/openvswitch
- name: host-log-ovs
- - mountPath: /var/log/ovn
- name: host-log-ovn
- readinessProbe:
- exec:
- command: ["ovn4nfv-k8s", "check_ovn_controller"]
- periodSeconds: 5
- livenessProbe:
- exec:
- command: ["ovn4nfv-k8s", "check_ovn_controller"]
- initialDelaySeconds: 10
- periodSeconds: 5
- failureThreshold: 5
- resources:
- requests:
- cpu: {{ ovn_controller_cpu_request }}
- memory: {{ ovn_controller_memory_request }}
- limits:
- cpu: {{ ovn_controller_cpu_limit }}
- memory: {{ ovn_controller_memory_limit }}
- nodeSelector:
- kubernetes.io/os: "linux"
- volumes:
- - name: host-modules
- hostPath:
- path: /lib/modules
- - name: host-run-ovs
- hostPath:
- path: /run/openvswitch
- - name: host-run-ovn
- hostPath:
- path: /run/ovn
- - name: host-sys
- hostPath:
- path: /sys
- - name: host-config-openvswitch
- hostPath:
- path: /etc/origin/openvswitch
- - name: host-log-ovs
- hostPath:
- path: /var/log/openvswitch
- - name: host-log-ovn
- hostPath:
- path: /var/log/ovn
diff --git a/roles/network_plugin/ovn4nfv/templates/ovn4nfv-k8s-plugin.yml.j2 b/roles/network_plugin/ovn4nfv/templates/ovn4nfv-k8s-plugin.yml.j2
deleted file mode 100644
index 4b693083fc2ccaba77bf5ad7a21ae30b0ddf520f..0000000000000000000000000000000000000000
--- a/roles/network_plugin/ovn4nfv/templates/ovn4nfv-k8s-plugin.yml.j2
+++ /dev/null
@@ -1,610 +0,0 @@
-
----
-
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- name: networks.k8s.plugin.opnfv.org
-spec:
- group: k8s.plugin.opnfv.org
- names:
- kind: Network
- listKind: NetworkList
- plural: networks
- singular: network
- scope: Namespaced
- versions:
- - name: v1alpha1
- served: true
- storage: true
- subresources:
- status: {}
- schema:
- openAPIV3Schema:
- type: object
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- properties:
- cniType:
- description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
- Important: Run "operator-sdk generate k8s" to regenerate code after
- modifying this file Add custom validation using kubebuilder tags:
- https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
- type: string
- dns:
- properties:
- domain:
- type: string
- nameservers:
- items:
- type: string
- type: array
- options:
- items:
- type: string
- type: array
- search:
- items:
- type: string
- type: array
- type: object
- ipv4Subnets:
- items:
- properties:
- excludeIps:
- type: string
- gateway:
- type: string
- name:
- type: string
- subnet:
- type: string
- required:
- - name
- - subnet
- type: object
- type: array
- ipv6Subnets:
- items:
- properties:
- excludeIps:
- type: string
- gateway:
- type: string
- name:
- type: string
- subnet:
- type: string
- required:
- - name
- - subnet
- type: object
- type: array
- routes:
- items:
- properties:
- dst:
- type: string
- gw:
- type: string
- required:
- - dst
- type: object
- type: array
- required:
- - cniType
- - ipv4Subnets
- type: object
- status:
- properties:
- state:
- description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
- of cluster Important: Run "operator-sdk generate k8s" to regenerate
- code after modifying this file Add custom validation using kubebuilder
- tags: https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
- type: string
- required:
- - state
- type: object
-
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- name: providernetworks.k8s.plugin.opnfv.org
-spec:
- group: k8s.plugin.opnfv.org
- names:
- kind: ProviderNetwork
- listKind: ProviderNetworkList
- plural: providernetworks
- singular: providernetwork
- scope: Namespaced
- versions:
- - name: v1alpha1
- served: true
- storage: true
- subresources:
- status: {}
- schema:
- openAPIV3Schema:
- description: ProviderNetwork is the Schema for the providernetworks API
- type: object
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: ProviderNetworkSpec defines the desired state of ProviderNetwork
- properties:
- cniType:
- description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
- Important: Run "operator-sdk generate k8s" to regenerate code after
- modifying this file Add custom validation using kubebuilder tags:
- https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
- type: string
- direct:
- properties:
- directNodeSelector:
- type: string
- nodeLabelList:
- items:
- type: string
- type: array
- providerInterfaceName:
- type: string
- required:
- - directNodeSelector
- - providerInterfaceName
- type: object
- dns:
- properties:
- domain:
- type: string
- nameservers:
- items:
- type: string
- type: array
- options:
- items:
- type: string
- type: array
- search:
- items:
- type: string
- type: array
- type: object
- ipv4Subnets:
- items:
- properties:
- excludeIps:
- type: string
- gateway:
- type: string
- name:
- type: string
- subnet:
- type: string
- required:
- - name
- - subnet
- type: object
- type: array
- ipv6Subnets:
- items:
- properties:
- excludeIps:
- type: string
- gateway:
- type: string
- name:
- type: string
- subnet:
- type: string
- required:
- - name
- - subnet
- type: object
- type: array
- providerNetType:
- type: string
- routes:
- items:
- properties:
- dst:
- type: string
- gw:
- type: string
- required:
- - dst
- type: object
- type: array
- vlan:
- properties:
- logicalInterfaceName:
- type: string
- nodeLabelList:
- items:
- type: string
- type: array
- providerInterfaceName:
- type: string
- vlanId:
- type: string
- vlanNodeSelector:
- type: string
- required:
- - providerInterfaceName
- - vlanId
- - vlanNodeSelector
- type: object
- required:
- - cniType
- - ipv4Subnets
- - providerNetType
- type: object
- status:
- description: ProviderNetworkStatus defines the observed state of ProviderNetwork
- properties:
- state:
- description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
- of cluster Important: Run "operator-sdk generate k8s" to regenerate
- code after modifying this file Add custom validation using kubebuilder
- tags: https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
- type: string
- required:
- - state
- type: object
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: k8s-nfn-sa
- namespace: kube-system
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- creationTimestamp: null
- name: k8s-nfn-cr
-rules:
-- apiGroups:
- - ""
- resources:
- - pods
- - pods/status
- - services
- - endpoints
- - persistentvolumeclaims
- - events
- - configmaps
- - secrets
- - nodes
- verbs:
- - '*'
-- apiGroups:
- - apps
- resources:
- - deployments
- - daemonsets
- - replicasets
- - statefulsets
- verbs:
- - '*'
-- apiGroups:
- - monitoring.coreos.com
- resources:
- - servicemonitors
- verbs:
- - get
- - create
-- apiGroups:
- - apps
- resourceNames:
- - nfn-operator
- resources:
- - deployments/finalizers
- verbs:
- - update
-- apiGroups:
- - k8s.plugin.opnfv.org
- resources:
- - '*'
- - providernetworks
- verbs:
- - '*'
-
----
-
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
- name: k8s-nfn-crb
-subjects:
-- kind: Group
- name: system:serviceaccounts
- apiGroup: rbac.authorization.k8s.io
-roleRef:
- kind: ClusterRole
- name: k8s-nfn-cr
- apiGroup: rbac.authorization.k8s.io
-
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: nfn-operator
- namespace: kube-system
-spec:
- type: NodePort
- ports:
- - port: 50000
- protocol: TCP
- targetPort: 50000
- selector:
- name: nfn-operator
-
-
----
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: ovn-controller-network
- namespace: kube-system
-data:
- OVN_SUBNET: "{{ kube_pods_subnet }}"
- OVN_GATEWAYIP: "{{ kube_pods_subnet|ipaddr('net')|ipaddr(1) }}"
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: nfn-operator
- namespace: kube-system
-spec:
- replicas: 1
- selector:
- matchLabels:
- name: nfn-operator
- template:
- metadata:
- labels:
- name: nfn-operator
- spec:
- hostNetwork: true
- affinity:
- nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- nodeSelectorTerms:
- - matchExpressions:
- - key: ovn4nfv-k8s-plugin
- operator: In
- values:
- - ovn-control-plane
- tolerations:
- - key: "node-role.kubernetes.io/master"
- effect: "NoSchedule"
- operator: "Exists"
- - key: "node-role.kubernetes.io/control-plane"
- effect: "NoSchedule"
- operator: "Exists"
- serviceAccountName: k8s-nfn-sa
- containers:
- - name: nfn-operator
- image: {{ ovn4nfv_k8s_plugin_image_repo }}:{{ ovn4nfv_k8s_plugin_image_tag }}
- command: ["/usr/local/bin/entrypoint", "operator"]
- imagePullPolicy: {{ k8s_image_pull_policy }}
- envFrom:
- - configMapRef:
- name: ovn-controller-network
- ports:
- - containerPort: 50000
- protocol: TCP
- env:
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- - name: OPERATOR_NAME
- value: "nfn-operator"
-
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
- name: ovn4nfv-cni-config
- namespace: kube-system
- labels:
- app: ovn4nfv
-data:
- ovn4nfv_k8s.conf: |
- [logging]
- loglevel=5
- logfile=/var/log/openvswitch/ovn4k8s.log
-
- [cni]
- conf-dir=/etc/cni/net.d
- plugin=ovn4nfvk8s-cni
-
- [kubernetes]
- kubeconfig=/etc/cni/net.d/ovn4nfv-k8s.d/ovn4nfv-k8s.kubeconfig
- 00-network.conf: |
- {
- "name": "ovn4nfv-k8s-plugin",
- "type": "ovn4nfvk8s-cni",
- "cniVersion": "0.3.1"
- }
-
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
- name: ovn4nfv-cni
- namespace: kube-system
- labels:
- app: ovn4nfv
-spec:
- updateStrategy:
- type: RollingUpdate
- selector:
- matchLabels:
- app: ovn4nfv
- template:
- metadata:
- labels:
- app: ovn4nfv
- spec:
- hostNetwork: true
- nodeSelector:
- kubernetes.io/arch: amd64
- tolerations:
- - operator: Exists
- effect: NoSchedule
- serviceAccountName: k8s-nfn-sa
- containers:
- - name: ovn4nfv
- image: {{ ovn4nfv_k8s_plugin_image_repo }}:{{ ovn4nfv_k8s_plugin_image_tag }}
- command: ["/usr/local/bin/entrypoint", "cni"]
- imagePullPolicy: {{ k8s_image_pull_policy }}
- resources:
- requests:
- cpu: {{ ovn4nfv_cni_cpu_request }}
- memory: {{ ovn4nfv_cni_memory_request }}
- limits:
- cpu: {{ ovn4nfv_cni_cpu_limit }}
- memory: {{ ovn4nfv_cni_memory_limit }}
- securityContext:
- privileged: true
- volumeMounts:
- - name: cni
- mountPath: /host/etc/cni/net.d
- - name: cnibin
- mountPath: /host/opt/cni/bin
- - name: cniconf
- mountPath: /host/etc/openvswitch
- - name: ovn4nfv-cfg
- mountPath: /tmp/ovn4nfv-conf
- - name: ovn4nfv-cni-net-conf
- mountPath: /tmp/ovn4nfv-cni
- volumes:
- - name: cni
- hostPath:
- path: /etc/cni/net.d
- - name: cnibin
- hostPath:
- path: /opt/cni/bin
- - name: cniconf
- hostPath:
- path: /etc/openvswitch
- - name: ovn4nfv-cfg
- configMap:
- name: ovn4nfv-cni-config
- items:
- - key: ovn4nfv_k8s.conf
- path: ovn4nfv_k8s.conf
- - name: ovn4nfv-cni-net-conf
- configMap:
- name: ovn4nfv-cni-config
- items:
- - key: 00-network.conf
- path: 00-network.conf
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
- name: nfn-agent
- namespace: kube-system
- labels:
- app: nfn-agent
-spec:
- selector:
- matchLabels:
- app: nfn-agent
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: nfn-agent
- spec:
- hostNetwork: true
- hostPID: true
- nodeSelector:
- kubernetes.io/arch: amd64
- tolerations:
- - operator: Exists
- effect: NoSchedule
- serviceAccountName: k8s-nfn-sa
- containers:
- - name: nfn-agent
- image: {{ ovn4nfv_k8s_plugin_image_repo }}:{{ ovn4nfv_k8s_plugin_image_tag }}
- command: ["/usr/local/bin/entrypoint", "agent"]
- imagePullPolicy: {{ k8s_image_pull_policy }}
- resources:
- requests:
- cpu: {{ nfn_agent_cpu_request }}
- memory: {{ nfn_agent_memory_request }}
- limits:
- cpu: {{ nfn_agent_cpu_limit }}
- memory: {{ nfn_agent_memory_limit }}
- env:
- - name: NFN_NODE_NAME
- valueFrom:
- fieldRef:
- fieldPath: spec.nodeName
- securityContext:
- runAsUser: 0
- capabilities:
- add: ["NET_ADMIN", "SYS_ADMIN", "SYS_PTRACE"]
- privileged: true
- volumeMounts:
- - mountPath: /var/run/dbus/
- name: host-var-run-dbus
- readOnly: true
- - mountPath: /run/openvswitch
- name: host-run-ovs
- - mountPath: /var/run/openvswitch
- name: host-var-run-ovs
- - mountPath: /var/run/ovn4nfv-k8s-plugin
- name: host-var-cniserver-socket-dir
- volumes:
- - name: host-run-ovs
- hostPath:
- path: /run/openvswitch
- - name: host-var-run-ovs
- hostPath:
- path: /var/run/openvswitch
- - name: host-var-run-dbus
- hostPath:
- path: /var/run/dbus
- - name: host-var-cniserver-socket-dir
- hostPath:
- path: /var/run/ovn4nfv-k8s-plugin
diff --git a/tests/files/packet_ubuntu18-ovn4nfv.yml b/tests/files/packet_ubuntu18-ovn4nfv.yml
deleted file mode 100644
index b75ba04d33d0075dff68830704f1c3d41c28351d..0000000000000000000000000000000000000000
--- a/tests/files/packet_ubuntu18-ovn4nfv.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Instance settings
-cloud_image: ubuntu-1804
-mode: default
-
-# Kubespray settings
-kube_network_plugin: ovn4nfv