From 9fbc8db799177e67c6100152ba706c8e934bb73e Mon Sep 17 00:00:00 2001 From: Kuralamudhan Ramakrishnan Date: Tue, 6 Oct 2020 13:19:40 -0700 Subject: fixing interface names for the cni-proxy related cni plugins Signed-off-by: Kuralamudhan Ramakrishnan Change-Id: I136c26213840881087ac18bac0778046807632ac --- example/multus-net-attach-def-cr.yaml | 10 ++++++++ ...-replica-2-with-multus-ovn4nfv-annotations.yaml | 30 ++++++++++++++++++++++ ...-deployment-with-multus-annotation-sandbox.yaml | 24 +++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 example/multus-net-attach-def-cr.yaml create mode 100644 example/ovn4nfv-deployment-replica-2-with-multus-ovn4nfv-annotations.yaml create mode 100644 example/ovn4nfv-deployment-with-multus-annotation-sandbox.yaml (limited to 'example') diff --git a/example/multus-net-attach-def-cr.yaml b/example/multus-net-attach-def-cr.yaml new file mode 100644 index 0000000..36239e7 --- /dev/null +++ b/example/multus-net-attach-def-cr.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition +metadata: + name: ovn4nfv-k8s-plugin +spec: + config: '{ + "cniVersion": "0.3.1", + "type": "ovn4nfvk8s-cni" + }' diff --git a/example/ovn4nfv-deployment-replica-2-with-multus-ovn4nfv-annotations.yaml b/example/ovn4nfv-deployment-replica-2-with-multus-ovn4nfv-annotations.yaml new file mode 100644 index 0000000..7beed49 --- /dev/null +++ b/example/ovn4nfv-deployment-replica-2-with-multus-ovn4nfv-annotations.yaml @@ -0,0 +1,30 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ovn4nfv-deployment-2-annotation + labels: + app: ovn4nfv-2-annotation +spec: + replicas: 2 + selector: + matchLabels: + app: ovn4nfv-2-annotation + template: + metadata: + labels: + app: ovn4nfv-2-annotation + annotations: + k8s.v1.cni.cncf.io/networks: '[ + { "name": "ovn4nfv-k8s-plugin", + "interface": "net1" + }]' + k8s.v1.cni.cncf.io/networks: ovn4nfv-k8s-plugin + k8s.plugin.opnfv.org/nfn-network: '{ "type": "ovn4nfv", "interface": [{ "name": "ovn-port-net", "interface": "net2" , "defaultGateway": "false"}, + { "name": "ovn-priv-net", "interface": "net3" , "defaultGateway": "false"}]}' + spec: + containers: + - name: ovn4nfv-deployment-2-annotation + image: "busybox" + command: ["top"] + stdin: true + tty: true diff --git a/example/ovn4nfv-deployment-with-multus-annotation-sandbox.yaml b/example/ovn4nfv-deployment-with-multus-annotation-sandbox.yaml new file mode 100644 index 0000000..3d5277e --- /dev/null +++ b/example/ovn4nfv-deployment-with-multus-annotation-sandbox.yaml @@ -0,0 +1,24 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ovn4nfv-deployment-with-multus-annotation-sandbox + labels: + app: ovn4nfv-with-multus-annotation-sandbox +spec: + replicas: 1 + selector: + matchLabels: + app: ovn4nfv-with-multus-annotation-sandbox + template: + metadata: + labels: + app: ovn4nfv-with-multus-annotation-sandbox + annotations: + k8s.v1.cni.cncf.io/networks: ovn4nfv-k8s-plugin + spec: + containers: + - name: ovn4nfv-deployment-with-multus-annotation-sandbox + image: "busybox" + command: ["top"] + stdin: true + tty: true -- cgit 1.2.3-korg