opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-03 03:39:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor buildah, image, storage, cni

Browse Source 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2019-03-28 10:30:09 +01:00
parent e7a2eecf5f
commit a5443a532b
79 changed files with 1875 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go generated vendored
View File

@@ -1,6 +1,7 @@
package ocicni
import (
"context"
"errors"
"fmt"
"net"
@@ -511,7 +512,7 @@ func (network *cniNetwork) addToNetwork(cacheDir string, podNetwork *PodNetwork,
netconf, cninet := network.NetworkConfig, network.CNIConfig
logrus.Infof("About to add CNI network %s (type=%v)", netconf.Name, netconf.Plugins[0].Network.Type)
res, err := cninet.AddNetworkList(netconf, rt)
res, err := cninet.AddNetworkList(context.Background(), netconf, rt)
if err != nil {
logrus.Errorf("Error adding network: %v", err)
return nil, err
@@ -529,7 +530,7 @@ func (network *cniNetwork) deleteFromNetwork(cacheDir string, podNetwork *PodNet
netconf, cninet := network.NetworkConfig, network.CNIConfig
logrus.Infof("About to del CNI network %s (type=%v)", netconf.Name, netconf.Plugins[0].Network.Type)
err = cninet.DelNetworkList(netconf, rt)
err = cninet.DelNetworkList(context.Background(), netconf, rt)
if err != nil {
logrus.Errorf("Error deleting network: %v", err)
return err

13
vendor/github.com/cri-o/ocicni/vendor.conf generated vendored Normal file
View File

@@ -0,0 +1,13 @@
github.com/containernetworking/cni fbb95fff8a5239a4295c991efa8a397d43118f7e
github.com/fsnotify/fsnotify 1485a34d5d5723fea214f5710708e19a831720e4
github.com/sirupsen/logrus 787e519fa85519b874dead61020de598e9a23944
github.com/onsi/ginkgo eea6ad008b96acdaa524f5b409513bf062b500ad
github.com/onsi/gomega 90e289841c1ed79b7a598a7cd9959750cb5e89e2
golang.org/x/net 63eda1eb0650888965ead1296efd04d0b2b61128
gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232
golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95
golang.org/x/sys f49334f85ddcf0f08d7fb6dd7363e9e6d6b777eb
github.com/hpcloud/tail a1dbeea552b7c8df4b542c66073e393de198a800
gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8
gopkg.in/fsnotify/fsnotify.v1 c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
github.com/konsorten/go-windows-terminal-sequences f55edac94c9bbba5d6182a4be46d86a2c9b5b50e