Skip to content

Commit 78bf592

Browse files
jaer-tsunsharmasushant
authored andcommitted
Updating ACN vendor. (#353)
* Updating ACN vendor. * Adding Gopkg.lock * Also required to update CNI API to include context
1 parent 8e3604c commit 78bf592

File tree

1,202 files changed

+186337
-42517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,202 files changed

+186337
-42517
lines changed

Gopkg.lock

Lines changed: 497 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Gopkg.toml example
2+
#
3+
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
4+
# for detailed Gopkg.toml documentation.
5+
#
6+
# required = ["github.com/user/thing/cmd/thing"]
7+
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
8+
#
9+
# [[constraint]]
10+
# name = "github.com/user/project"
11+
# version = "1.0.0"
12+
#
13+
# [[constraint]]
14+
# name = "github.com/user/project2"
15+
# branch = "dev"
16+
# source = "github.com/myfork/project2"
17+
#
18+
# [[override]]
19+
# name = "github.com/x/y"
20+
# version = "2.4.0"
21+
#
22+
# [prune]
23+
# non-go = false
24+
# go-tests = true
25+
# unused-packages = true
26+
27+
28+
[[constraint]]
29+
name = "github.com/Microsoft/go-winio"
30+
version = "0.4.12"
31+
32+
[[constraint]]
33+
name = "github.com/docker/libnetwork"
34+
version = "0.5.6"
35+
36+
[[constraint]]
37+
name = "github.com/google/uuid"
38+
version = "1.1.1"
39+
40+
[[constraint]]
41+
branch = "master"
42+
name = "golang.org/x/sys"
43+
44+
[[constraint]]
45+
branch = "master"
46+
name = "k8s.io/api"
47+
48+
[[constraint]]
49+
name = "k8s.io/apimachinery"
50+
revision = "d7deff9243b165ee192f5551710ea4285dcfd615"
51+
52+
[[constraint]]
53+
name = "k8s.io/client-go"
54+
version = "11.0.0"
55+
56+
[[constraint]]
57+
name = "github.com/Microsoft/hcsshim"
58+
version = "0.8.6"
59+
60+
[[constraint]]
61+
name = "github.com/containernetworking/cni"
62+
revision = "fbb95fff8a5239a4295c991efa8a397d43118f7e"
63+
64+
[prune]
65+
go-tests = true
66+
unused-packages = true

cni/plugin.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package cni
55

66
import (
7+
"context"
78
"fmt"
89
"os"
910
"runtime"
@@ -108,7 +109,7 @@ func (plugin *Plugin) DelegateAdd(pluginName string, nwCfg *NetworkConfig) (*cni
108109

109110
os.Setenv(Cmd, CmdAdd)
110111

111-
res, err := cniInvoke.DelegateAdd(pluginName, nwCfg.Serialize(), nil)
112+
res, err := cniInvoke.DelegateAdd(context.TODO(), pluginName, nwCfg.Serialize(), nil)
112113
if err != nil {
113114
return nil, fmt.Errorf("Failed to delegate: %v", err)
114115
}
@@ -130,7 +131,7 @@ func (plugin *Plugin) DelegateDel(pluginName string, nwCfg *NetworkConfig) error
130131

131132
os.Setenv(Cmd, CmdDel)
132133

133-
err = cniInvoke.DelegateDel(pluginName, nwCfg.Serialize(), nil)
134+
err = cniInvoke.DelegateDel(context.TODO(), pluginName, nwCfg.Serialize(), nil)
134135
if err != nil {
135136
return fmt.Errorf("Failed to delegate: %v", err)
136137
}

cns/service/service.exe

9.2 MB
Binary file not shown.

vendor.conf

Lines changed: 0 additions & 4 deletions
This file was deleted.

vendor/github.com/Microsoft/go-winio/fileinfo.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/.gometalinter.json

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/appveyor.yml

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/NOTICE

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/hcsshim.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)