From fc4652697b6ee2c00a0076aad11ce475d2c01484 Mon Sep 17 00:00:00 2001 From: dougbtv Date: Thu, 3 May 2018 14:50:07 -0400 Subject: [PATCH] [bugfix][docs] Updates examples to match spec criteria --- examples/flannel-conf.yml | 16 ++++++++-------- examples/macvlan-conf.yml | 34 +++++++++++++++++----------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/flannel-conf.yml b/examples/flannel-conf.yml index 7d1bedb24..bb9c992cc 100644 --- a/examples/flannel-conf.yml +++ b/examples/flannel-conf.yml @@ -2,11 +2,11 @@ apiVersion: "kubernetes.cni.cncf.io/v1" kind: Network metadata: name: flannel-conf -plugin: flannel -args: '[ - { - "delegate": { - "isDefaultGateway": true - } - } -]' +spec: + config: '{ + "cniVersion": "0.3.0", + "type": "flannel", + "delegate": { + "isDefaultGateway": true + } + }' \ No newline at end of file diff --git a/examples/macvlan-conf.yml b/examples/macvlan-conf.yml index e376de38f..90a68efc7 100644 --- a/examples/macvlan-conf.yml +++ b/examples/macvlan-conf.yml @@ -2,20 +2,20 @@ apiVersion: "kubernetes.cni.cncf.io/v1" kind: Network metadata: name: macvlan-conf -plugin: macvlan -args: '[ - { - "master": "eth0", - "mode": "bridge", - "ipam": { - "type": "host-local", - "subnet": "192.168.1.0/24", - "rangeStart": "192.168.1.200", - "rangeEnd": "192.168.1.216", - "routes": [ - { "dst": "0.0.0.0/0" } - ], - "gateway": "192.168.1.1" - } - } -]' +spec: + config: '{ + "cniVersion": "0.3.0", + "type": "macvlan", + "master": "eth0", + "mode": "bridge", + "ipam": { + "type": "host-local", + "subnet": "192.168.1.0/24", + "rangeStart": "192.168.1.200", + "rangeEnd": "192.168.1.216", + "routes": [ + { "dst": "0.0.0.0/0" } + ], + "gateway": "192.168.1.1" + } + }' \ No newline at end of file