server: port to github.com/cri-o/ocicni; remove pkg/ocicni

Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams 2017-09-05 15:10:42 -05:00
parent 3db6ba7667
commit 0df30c5319
12 changed files with 28 additions and 619 deletions

View file

@ -5,6 +5,8 @@ import (
"io"
"os"
"strings"
"github.com/cri-o/ocicni/pkg/ocicni"
)
const (
@ -144,3 +146,12 @@ func SysctlsFromPodAnnotation(annotation string) ([]Sysctl, error) {
}
return sysctls, nil
}
func newPodNetwork(namespace, name, id, netns string) ocicni.PodNetwork {
return ocicni.PodNetwork{
Name: name,
Namespace: namespace,
ID: id,
NetNS: netns,
}
}