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/simpleovs

diff --git a/resources/simpleovs b/resources/simpleovs
index f43b8a1..df0d975 100755
--- a/resources/simpleovs
+++ b/resources/simpleovs
@@ -60,9 +60,9 @@
 case $CNI_COMMAND in
 ADD)
 	res=$(ipam)
-	ip=$(echo $res | jq -r '.ip4.ip')
+	ip=$(echo $res | jq -r '.ips[0].address')
 	add_br_and_port $ip
-        echo '{"cniVersion":"0.2.0"}' | jq -c --arg ip $ip '.ip4.ip = $ip' >&3
+        echo '{"cniVersion":"0.3.1"}' | jq -c --arg ip $ip '.ips[0].address = $ip' >&3
 	;;
 DEL)
 	set +o errexit