Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/containernetworking/cni from 0.7.1 to 0.8.0 #5410

Merged
merged 2 commits into from
Jul 6, 2020
Merged

Bump github.com/containernetworking/cni from 0.7.1 to 0.8.0 #5410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8faa17f
Bump github.com/containernetworking/cni from 0.7.1 to 0.8.0
dependabot-preview[bot] Jul 2, 2020
622f00b
Update container IDs used in tests to reflect latest CNI spec
Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
8 changes: 4 additions & 4 deletions pkg/network/network_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down