Skip to content

Commit 8fbf363

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #56 from aojea/bumpcni
bump containernetworking/cni to v0.8.0
2 parents 1582593 + 49657db commit 8fbf363

File tree

13 files changed

+368
-95
lines changed

13 files changed

+368
-95
lines changed

‎cni_test.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,11 @@ func (m *MockCNI) CheckNetwork(ctx context.Context, net *cnilibrary.NetworkConfi
224224
return args.Error(0)
225225
}
226226

227+
func (m *MockCNI) GetNetworkCachedConfig(net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) ([]byte, *cnilibrary.RuntimeConf, error) {
228+
args := m.Called(net, rt)
229+
return args.Get(0).([]byte), args.Get(1).(*cnilibrary.RuntimeConf), args.Error(1)
230+
}
231+
227232
func (m *MockCNI) GetNetworkCachedResult(net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) (types.Result, error) {
228233
args := m.Called(net, rt)
229234
return args.Get(0).(types.Result), args.Error(1)
@@ -239,8 +244,12 @@ func (m *MockCNI) ValidateNetwork(ctx context.Context, net *cnilibrary.NetworkCo
239244
return args.Get(0).([]string), args.Error(1)
240245
}
241246

247+
func (m *MockCNI) GetNetworkListCachedConfig(net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) ([]byte, *cnilibrary.RuntimeConf, error) {
248+
args := m.Called(net, rt)
249+
return args.Get(0).([]byte), args.Get(1).(*cnilibrary.RuntimeConf), args.Error(1)
250+
}
251+
242252
func (m *MockCNI) GetNetworkListCachedResult(net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) (types.Result, error) {
243253
args := m.Called(net, rt)
244254
return args.Get(0).(types.Result), args.Error(1)
245-
246255
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/containerd/go-cni
22

33
require (
4-
github.com/containernetworking/cni v0.7.1
4+
github.com/containernetworking/cni v0.8.0
55
github.com/davecgh/go-spew v1.1.1 // indirect
66
github.com/onsi/ginkgo v1.10.3 // indirect
77
github.com/onsi/gomega v1.7.1 // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/containernetworking/cni v0.7.1 h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE=
2-
github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
1+
github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI=
2+
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=

0 commit comments

Comments
 (0)