Update deployment and integration test

Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-16 20:30:05 -07:00
parent 5a68bd70c8
commit 35eb96d901
7 changed files with 152 additions and 11 deletions
--- a/cluster/gce/cni.template
+++ b/cluster/gce/cni.template
@@ -7,12 +7,8 @@
      "mtu": 1460,
      "ipam": {
        "type": "host-local",
-        "subnet": "{{.PodCIDR}}",
-        "routes": [
-          {
-            "dst": "0.0.0.0/0"
-          }
-        ]
+        "ranges": [{{range $i, $range := .PodCIDRRanges}}{{if $i}}, {{end}}[{"subnet": "{{$range}}"}]{{end}}],
+	"routes": [{{range $i, $route := .Routes}}{{if $i}}, {{end}}{"dst": "{{$route}}"}{{end}}]
      }
    },
    {