From 0135e2751ec9c42bb692f93632db8ec033cd4662 Mon Sep 17 00:00:00 2001 From: Gabe Rosenhouse Date: Mon, 19 Sep 2016 13:10:27 -0700 Subject: [PATCH] versioning: ipam config is not versioned --- plugins/main/bridge/bridge_test.go | 1 - plugins/main/ipvlan/ipvlan_test.go | 1 - plugins/main/macvlan/macvlan_test.go | 1 - plugins/main/ptp/ptp_test.go | 1 - 4 files changed, 4 deletions(-) diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go index 3688fee..3840aa9 100644 --- a/plugins/main/bridge/bridge_test.go +++ b/plugins/main/bridge/bridge_test.go @@ -135,7 +135,6 @@ var _ = Describe("bridge Operations", func() { "isDefaultGateway": true, "ipMasq": false, "ipam": { - "cniVersion": "0.2.0", "type": "host-local", "subnet": "%s" } diff --git a/plugins/main/ipvlan/ipvlan_test.go b/plugins/main/ipvlan/ipvlan_test.go index e38aa05..4e09ceb 100644 --- a/plugins/main/ipvlan/ipvlan_test.go +++ b/plugins/main/ipvlan/ipvlan_test.go @@ -107,7 +107,6 @@ var _ = Describe("ipvlan Operations", func() { "type": "ipvlan", "master": "%s", "ipam": { - "cniVersion": "0.2.0", "type": "host-local", "subnet": "10.1.2.0/24" } diff --git a/plugins/main/macvlan/macvlan_test.go b/plugins/main/macvlan/macvlan_test.go index 6feb342..9594a59 100644 --- a/plugins/main/macvlan/macvlan_test.go +++ b/plugins/main/macvlan/macvlan_test.go @@ -107,7 +107,6 @@ var _ = Describe("macvlan Operations", func() { "type": "macvlan", "master": "%s", "ipam": { - "cniVersion": "0.2.0", "type": "host-local", "subnet": "10.1.2.0/24" } diff --git a/plugins/main/ptp/ptp_test.go b/plugins/main/ptp/ptp_test.go index 2ebaaf5..5b85670 100644 --- a/plugins/main/ptp/ptp_test.go +++ b/plugins/main/ptp/ptp_test.go @@ -49,7 +49,6 @@ var _ = Describe("ptp Operations", func() { "ipMasq": true, "mtu": 5000, "ipam": { - "cniVersion": "0.2.0", "type": "host-local", "subnet": "10.1.2.0/24" } -- 2.44.0