From 8faa17fa27f1d031cb698935019f7f73e3fee09b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jul 2020 08:08:02 +0000 Subject: [PATCH 1/2] Bump github.com/containernetworking/cni from 0.7.1 to 0.8.0 Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 0.7.1 to 0.8.0. - [Release notes](https://github.com/containernetworking/cni/releases) - [Commits](https://github.com/containernetworking/cni/compare/v0.7.1...v0.8.0) Signed-off-by: dependabot-preview[bot] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 02fd7cac0e..73cfb6c8da 100644 --- 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 index 74666b9140..65ed54fe5b 100644 --- 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= From 622f00b4ad224086de55bc8e70235585befd055e Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Mon, 6 Jul 2020 17:20:46 +0000 Subject: [PATCH 2/2] Update container IDs used in tests to reflect latest CNI spec --- pkg/network/network_linux_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/network/network_linux_test.go b/pkg/network/network_linux_test.go index b3e5da7174..8e43edd924 100644 --- 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 }