github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Fake docker portfoward for in-process docker CRI integration

Browse Source
This commit is contained in:
Pengfei Ni
2016-09-30 11:30:45 +08:00
parent cfb833e86a
commit dd14f6368a
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/dockertools/docker_manager.go
View File

@@ -1273,11 +1273,16 @@ func noPodInfraContainerError(podName, podNamespace string) error {
// - should we support nsenter + socat on the host? (current impl)
// - should we support nsenter + socat in a container, running with elevated privs and --pid=host?
func (dm *DockerManager) PortForward(pod *kubecontainer.Pod, port uint16, stream io.ReadWriteCloser) error {
return PortForward(dm.client, pod, port, stream)
}
// Temporarily export this function to share with dockershim.
func PortForward(client DockerInterface, pod *kubecontainer.Pod, port uint16, stream io.ReadWriteCloser) error {
podInfraContainer := pod.FindContainerByName(PodInfraContainerName)
if podInfraContainer == nil {
return noPodInfraContainerError(pod.Name, pod.Namespace)
}
container, err := dm.client.InspectContainer(podInfraContainer.ID.ID)
container, err := client.InspectContainer(podInfraContainer.ID.ID)
if err != nil {
return err
}