diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go index 8bc8ffddb..833188eae 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/containerd/containerd" - "github.com/cri-o/ocicni" + "github.com/cri-o/ocicni/pkg/ocicni" "github.com/golang/glog" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/server/sandbox_run_test.go b/pkg/server/sandbox_run_test.go index 0a1996bf6..d3126c225 100644 --- a/pkg/server/sandbox_run_test.go +++ b/pkg/server/sandbox_run_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/cri-o/ocicni" + "github.com/cri-o/ocicni/pkg/ocicni" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" diff --git a/pkg/server/sandbox_status.go b/pkg/server/sandbox_status.go index c2cd1c825..2e84cedc7 100644 --- a/pkg/server/sandbox_status.go +++ b/pkg/server/sandbox_status.go @@ -22,6 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" + "github.com/cri-o/ocicni/pkg/ocicni" "github.com/golang/glog" "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" @@ -57,7 +58,15 @@ func (c *criContainerdService) PodSandboxStatus(ctx context.Context, r *runtime. state = runtime.PodSandboxState_SANDBOX_READY } } - ip, err := c.netPlugin.GetPodNetworkStatus(sandbox.NetNSPath) + config := sandbox.Config + podNetwork := ocicni.PodNetwork{ + Name: config.GetMetadata().GetName(), + Namespace: config.GetMetadata().GetNamespace(), + ID: id, + NetNS: sandbox.NetNSPath, + PortMappings: toCNIPortMappings(config.GetPortMappings()), + } + ip, err := c.netPlugin.GetPodNetworkStatus(podNetwork) if err != nil { // Ignore the error on network status ip = "" diff --git a/pkg/server/sandbox_stop.go b/pkg/server/sandbox_stop.go index a19ea1454..cd56aebe7 100644 --- a/pkg/server/sandbox_stop.go +++ b/pkg/server/sandbox_stop.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/cri-o/ocicni" + "github.com/cri-o/ocicni/pkg/ocicni" "github.com/golang/glog" "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" diff --git a/pkg/server/service.go b/pkg/server/service.go index fca4e1070..f64655e0f 100644 --- a/pkg/server/service.go +++ b/pkg/server/service.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/cri-o/ocicni" + "github.com/cri-o/ocicni/pkg/ocicni" "github.com/golang/glog" "google.golang.org/grpc" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" diff --git a/pkg/server/testing/fake_cni_plugin.go b/pkg/server/testing/fake_cni_plugin.go index c3f212032..ec964cc1a 100644 --- a/pkg/server/testing/fake_cni_plugin.go +++ b/pkg/server/testing/fake_cni_plugin.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/cri-o/ocicni" + "github.com/cri-o/ocicni/pkg/ocicni" ) // CalledDetail is the struct contains called function name and arguments. @@ -148,14 +148,14 @@ func (f *FakeCNIPlugin) TearDownPod(podNetwork ocicni.PodNetwork) error { } // GetPodNetworkStatus get the status of network. -func (f *FakeCNIPlugin) GetPodNetworkStatus(netnsPath string) (string, error) { +func (f *FakeCNIPlugin) GetPodNetworkStatus(podNetwork ocicni.PodNetwork) (string, error) { f.Lock() defer f.Unlock() - f.appendCalled("GetPodNetworkStatus", netnsPath) + f.appendCalled("GetPodNetworkStatus", podNetwork) if err := f.getError("GetPodNetworkStatus"); err != nil { return "", err } - ip, ok := f.IPMap[netnsPath] + ip, ok := f.IPMap[podNetwork.NetNS] if !ok { return "", fmt.Errorf("failed to find the IP") }