commit 84f0f17bc9872c1d9b2038d953d1dbcccc88e826
author Hyunsun <Hyunsun@node.aiab.cord-testdrive-pg0.wisc.cloudlab.us> Wed Sep 23 15:40:08 2020 -0500
committer Hyunsun <Hyunsun@node.aiab.cord-testdrive-pg0.wisc.cloudlab.us> Wed Sep 23 15:40:08 2020 -0500
tree 666ecec488de8fd16ce658da317019ddef2d5411
parent af084f3e333d2c797702216d5b5126321aad67b5

Add support of K8S 1.18

Change-Id: Idbde968ad1175f6a166570c9ab098d49d6a324cb

resources/router.yaml

diff --git a/resources/router.yaml b/resources/router.yaml
index 142aee2..89dbf50 100644
--- a/resources/router.yaml
+++ b/resources/router.yaml
@@ -19,6 +19,7 @@
   name: core-net
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "simpleovs",
     "ipam": {
         "type": "static"
@@ -31,6 +32,7 @@
   name: access-net
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "simpleovs",
     "ipam": {
         "type": "static"
@@ -43,6 +45,7 @@
   name: enb-net
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "simpleovs",
     "ipam": {
         "type": "static"
@@ -57,9 +60,9 @@
     app: router
   annotations:
     k8s.v1.cni.cncf.io/networks: '[
-            { "name": "core-net", "interface": "sgi-rtr", "ips": "192.168.250.1/24" },
-            { "name": "enb-net", "interface": "enb-rtr", "ips": "192.168.251.1/24" },
-            { "name": "access-net", "interface": "s1u-rtr", "ips": "192.168.252.1/24" }
+            { "name": "core-net", "interface": "core-rtr", "ips": ["192.168.250.1/24"] },
+            { "name": "enb-net", "interface": "enb-rtr", "ips": ["192.168.251.1/24"] },
+            { "name": "access-net", "interface": "access-rtr", "ips": ["192.168.252.1/24"] }
     ]'
 spec:
   containers: