git://git.halfball.org
/
cni.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fba3762
)
versioning: ipam config is not versioned
author
Gabe Rosenhouse
<grosenhouse@pivotal.io>
Mon, 19 Sep 2016 20:10:27 +0000
(13:10 -0700)
committer
pivotal
<name@example.com>
Mon, 19 Sep 2016 20:25:28 +0000
(13:25 -0700)
plugins/main/bridge/bridge_test.go
patch
|
blob
|
history
plugins/main/ipvlan/ipvlan_test.go
patch
|
blob
|
history
plugins/main/macvlan/macvlan_test.go
patch
|
blob
|
history
plugins/main/ptp/ptp_test.go
patch
|
blob
|
history
diff --git
a/plugins/main/bridge/bridge_test.go
b/plugins/main/bridge/bridge_test.go
index
3688fee
..
3840aa9
100644
(file)
--- 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
(file)
--- 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
(file)
--- 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
(file)
--- 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"
}