diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 8fc9dea78e0..159f4dce33c 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -894,36 +894,11 @@ func (m *kubeGenericRuntimeManager) GetPodStatus(uid kubetypes.UID, name, namesp }, nil } -// Returns the filesystem path of the pod's network namespace; if the -// runtime does not handle namespace creation itself, or cannot return -// the network namespace path, it returns an 'not supported' error. -// TODO: Rename param name to sandboxID in kubecontainer.Runtime.GetNetNS(). -// TODO: Remove GetNetNS after networking is delegated to the container runtime. -func (m *kubeGenericRuntimeManager) GetNetNS(sandboxID kubecontainer.ContainerID) (string, error) { - filter := &runtimeApi.PodSandboxFilter{ - Id: &sandboxID.ID, - LabelSelector: map[string]string{kubernetesManagedLabel: "true"}, - } - sandboxes, err := m.runtimeService.ListPodSandbox(filter) - if err != nil { - glog.Errorf("ListPodSandbox with filter %q failed: %v", filter, err) - return "", err - } - if len(sandboxes) == 0 { - glog.Errorf("No sandbox is found with filter %q", filter) - return "", fmt.Errorf("Sandbox %q is not found", sandboxID) - } - - sandboxStatus, err := m.runtimeService.PodSandboxStatus(sandboxes[0].GetId()) - if err != nil { - glog.Errorf("PodSandboxStatus with id %q failed: %v", sandboxes[0].GetId(), err) - return "", err - } - - if sandboxStatus.Linux != nil && sandboxStatus.Linux.Namespaces != nil { - return sandboxStatus.Linux.Namespaces.GetNetwork(), nil - } - +// Returns the filesystem path of the pod's network namespace. +// +// For CRI, container network is handled by the runtime completely and this +// function should never be called. +func (m *kubeGenericRuntimeManager) GetNetNS(_ kubecontainer.ContainerID) (string, error) { return "", fmt.Errorf("not supported") }