Merge pull request #5410 from hpcng/dependabot/go_modules/github.com/…

…containernetworking/cni-0.8.0
apptainer · Jul 6, 2020 · 2b09ed7 · 2b09ed7
2 parents 7d06f8b + 622f00b
commit 2b09ed7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/bugsnag/panicwrap v1.2.0 // indirect
 	github.com/containerd/cgroups v0.0.0-20200116170754-a8908713319d
 	github.com/containerd/containerd v1.3.6
-	github.com/containernetworking/cni v0.7.1
+	github.com/containernetworking/cni v0.8.0
 	github.com/containernetworking/plugins v0.8.6
 	github.com/containers/image/v5 v5.5.1
 	github.com/deislabs/oras v0.8.1

diff --git a/go.sum b/go.sum
@@ -96,6 +96,8 @@ github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8N
 github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
 github.com/containernetworking/cni v0.7.1 h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE=
 github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
+github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI=
+github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
 github.com/containernetworking/plugins v0.8.6 h1:npZTLiMa4CRn6m5P9+1Dz4O1j0UeFbm8VYN6dlsw568=
 github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM=
 github.com/containers/image/v5 v5.5.1 h1:h1FCOXH6Ux9/p/E4rndsQOC4yAdRU0msRTfLVeQ7FDQ=

diff --git a/pkg/network/network_linux_test.go b/pkg/network/network_linux_test.go
@@ -369,7 +369,7 @@ func TestNewSetup(t *testing.T) {
 func testPingIP(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, stdout io.ReadCloser) error {
 	testIP := "10.111.111.10"
 
-	setup, err := NewSetup([]string{"test-bridge"}, "_test_", nsPath, cniPath)
+	setup, err := NewSetup([]string{"test-bridge"}, "test_", nsPath, cniPath)
 	if err != nil {
 		return err
 	}
@@ -399,7 +399,7 @@ func testPingIP(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, stdout io
 
 // ping random acquired IP from host
 func testPingRandomIP(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, stdout io.ReadCloser) error {
-	setup, err := NewSetup([]string{"test-bridge"}, "_test_", nsPath, cniPath)
+	setup, err := NewSetup([]string{"test-bridge"}, "test_", nsPath, cniPath)
 	if err != nil {
 		return err
 	}
@@ -425,7 +425,7 @@ func testPingRandomIP(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, std
 
 // ping IP from host within requested IP range
 func testPingIPRange(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, stdout io.ReadCloser) error {
-	setup, err := NewSetup([]string{"test-bridge-iprange"}, "_test_", nsPath, cniPath)
+	setup, err := NewSetup([]string{"test-bridge-iprange"}, "test_", nsPath, cniPath)
 	if err != nil {
 		return err
 	}
@@ -459,7 +459,7 @@ func testPingIPRange(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, stdo
 // test port mapping by connecting to port 80 mapped inside container
 // to 31080 on host
 func testHTTPPortmap(nsPath string, cniPath *CNIPath, stdin io.WriteCloser, stdout io.ReadCloser) error {
-	setup, err := NewSetup([]string{"test-bridge"}, "_test_", nsPath, cniPath)
+	setup, err := NewSetup([]string{"test-bridge"}, "test_", nsPath, cniPath)
 	if err != nil {
 		return err
 	}