summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2018-10-18 10:10:39 -0700
committerVictor Morales <victor.morales@intel.com>2018-10-20 05:29:24 -0700
commit1fbc9a8817fd34b0b0603b1ac59771c271f7d527 (patch)
tree1c1b635cbc3878404f63f8c21e2f52d6412efcf4
parent6942719b390a62695d6dd3efa09eadf6ec48aa7a (diff)
Bump multus version to 3.1
Change-Id: Id98a0ef126a4121cc8e33c95672f1dd552b1560f Signed-off-by: Ritu Sood <ritu.sood@intel.com> Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-271
-rw-r--r--vagrant/playbooks/configure-multus.yml31
-rw-r--r--vagrant/playbooks/krd-vars.yml2
-rwxr-xr-xvagrant/tests/_common.sh61
3 files changed, 49 insertions, 45 deletions
diff --git a/vagrant/playbooks/configure-multus.yml b/vagrant/playbooks/configure-multus.yml
index 58eda4bd..33e72757 100644
--- a/vagrant/playbooks/configure-multus.yml
+++ b/vagrant/playbooks/configure-multus.yml
@@ -62,10 +62,13 @@
block: |
{
"type": "multus",
+ "name": "multus-cni",
+ "cniVersion": "0.3.1",
"kubeconfig": "/etc/kubernetes/admin.conf",
"delegates": [
{
"type": "flannel",
+ "cniVersion": "0.3.1",
"masterplugin": true,
"delegate": {
"isDefaultGateway": true
@@ -86,25 +89,25 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- # name must match the spec fields below, and be in the form: <plural>.<group>
- name: networks.kubernetes.cni.cncf.io
+ name: network-attachment-definitions.k8s.cni.cncf.io
spec:
- # group name to use for REST API: /apis/<group>/<version>
- group: kubernetes.cni.cncf.io
- # version name to use for REST API: /apis/<group>/<version>
+ group: k8s.cni.cncf.io
version: v1
- # either Namespaced or Cluster
scope: Namespaced
names:
- # plural name to be used in the URL: /apis/<group>/<version>/<plural>
- plural: networks
- # singular name to be used as an alias on the CLI and for display
- singular: network
- # kind is normally the CamelCased singular type. Your resource manifests use this.
- kind: Network
- # shortNames allow shorter string to match your resource on the CLI
+ plural: network-attachment-definitions
+ singular: network-attachment-definition
+ kind: NetworkAttachmentDefinition
shortNames:
- - net
+ - net-attach-def
+ validation:
+ openAPIV3Schema:
+ properties:
+ spec:
+ properties:
+ config:
+ type: string
+
- name: create network objects
shell: "/usr/local/bin/kubectl apply -f /tmp/crdnetwork.yml"
ignore_errors: True
diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml
index d5bec5b6..1e0f732f 100644
--- a/vagrant/playbooks/krd-vars.yml
+++ b/vagrant/playbooks/krd-vars.yml
@@ -12,7 +12,7 @@ base_dest: /tmp
multus_dest: "{{ base_dest }}/multus-cni"
multus_source_type: "tarball"
-multus_version: 2.0
+multus_version: 3.1
multus_url: "https://github.com/intel/multus-cni/releases/download/v{{ multus_version }}/multus-cni_v{{ multus_version }}_linux_amd64.tar.gz"
#multus_source_type: "source"
#multus_version: def72938cd2fb272eb3a6f64a8162b1049404357
diff --git a/vagrant/tests/_common.sh b/vagrant/tests/_common.sh
index 21aad4d2..e5f269dc 100755
--- a/vagrant/tests/_common.sh
+++ b/vagrant/tests/_common.sh
@@ -43,8 +43,8 @@ resources:
META
cat << NET > unprotected-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: unprotected-private-net-cidr
spec:
@@ -59,8 +59,8 @@ spec:
NET
cat << NET > protected-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: protected-private-net-cidr
spec:
@@ -75,8 +75,8 @@ spec:
NET
cat << NET > onap-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: onap-private-net-cidr
spec:
@@ -107,7 +107,7 @@ spec:
labels:
app: vFirewall
annotations:
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth2" }
]'
@@ -140,7 +140,7 @@ spec:
labels:
app: vFirewall
annotations:
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "protected-private-net-cidr", "interfaceRequest": "eth2" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth3" }
@@ -171,7 +171,7 @@ spec:
labels:
app: vFirewall
annotations:
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "protected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth2" }
]'
@@ -244,8 +244,8 @@ spec:
INGRESS
cat << NET > unprotected-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: unprotected-private-net-cidr
spec:
@@ -260,8 +260,8 @@ spec:
NET
cat << NET > protected-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: protected-private-net-cidr
spec:
@@ -276,8 +276,8 @@ spec:
NET
cat << NET > onap-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: onap-private-net-cidr
spec:
@@ -349,7 +349,7 @@ spec:
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth2" }
]'
@@ -416,7 +416,7 @@ spec:
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "protected-private-net-cidr", "interfaceRequest": "eth2" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth3" }
@@ -460,7 +460,7 @@ spec:
labels:
app: vFirewall
annotations:
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "protected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth2" }
]'
@@ -506,8 +506,8 @@ resources:
META
cat << NET > unprotected-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: unprotected-private-net-cidr
spec:
@@ -522,8 +522,8 @@ spec:
NET
cat << NET > protected-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: protected-private-net-cidr
spec:
@@ -538,8 +538,8 @@ spec:
NET
cat << NET > onap-private-net-cidr-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: onap-private-net-cidr
spec:
@@ -611,7 +611,7 @@ spec:
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth2" }
]'
@@ -678,7 +678,7 @@ spec:
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "unprotected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "protected-private-net-cidr", "interfaceRequest": "eth2" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth3" }
@@ -744,7 +744,7 @@ spec:
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "protected-private-net-cidr", "interfaceRequest": "eth1" },
{ "name": "onap-private-net-cidr", "interfaceRequest": "eth2" }
]'
@@ -791,12 +791,13 @@ resources:
META
cat << NET > bridge-network.yaml
-apiVersion: "kubernetes.cni.cncf.io/v1"
-kind: Network
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
metadata:
name: bridge-conf
spec:
config: '{
+ "cniVersion": "0.3.0",
"name": "mynet",
"type": "bridge",
"ipam": {
@@ -823,7 +824,7 @@ spec:
labels:
app: multus
annotations:
- kubernetes.v1.cni.cncf.io/networks: '[
+ k8s.v1.cni.cncf.io/networks: '[
{ "name": "bridge-conf", "interfaceRequest": "eth1" },
{ "name": "bridge-conf", "interfaceRequest": "eth2" }
]'