rancher/plugins
1
0
Fork 1
mirror of https://github.com/rancher/plugins.git synced 2025-09-06 21:17:42 +00:00
Code Issues Projects Releases Wiki Activity

vendor: bump cni to 0.5.2-git49d814c

Browse Source
This commit is contained in:
Dan Williams
2017-06-22 09:44:41 -05:00
parent 5a7a8b3069
commit 121362601b
6 changed files with 67 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vendor/github.com/containernetworking/cni/pkg/invoke/args.go generated vendored
View File

@@ -57,13 +57,16 @@ func (args *Args) AsEnv() []string {
pluginArgsStr = stringify(args.PluginArgs)
}
env = append(env,
"CNI_COMMAND="+args.Command,
"CNI_CONTAINERID="+args.ContainerID,
"CNI_NETNS="+args.NetNS,
"CNI_ARGS="+pluginArgsStr,
"CNI_IFNAME="+args.IfName,
"CNI_PATH="+args.Path)
// Ensure that the custom values are first, so any value present in
// the process environment won't override them.
env = append([]string{
"CNI_COMMAND=" + args.Command,
"CNI_CONTAINERID=" + args.ContainerID,
"CNI_NETNS=" + args.NetNS,
"CNI_ARGS=" + pluginArgsStr,
"CNI_IFNAME=" + args.IfName,
"CNI_PATH=" + args.Path,
}, env...)
return env
}