mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #33815 from Random-Liu/add-cri-fake-attach
Automatic merge from submit-queue CRI: Add fake attach support in CRI. For #31459. I've tested in my cluster, it works. @feiskyer @yujuhong
This commit is contained in:
commit
918e99e298
@ -569,6 +569,12 @@ func (m *kubeGenericRuntimeManager) killContainersWithSyncResult(pod *api.Pod, r
|
||||
|
||||
// AttachContainer attaches to the container's console
|
||||
func (m *kubeGenericRuntimeManager) AttachContainer(id kubecontainer.ContainerID, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resize <-chan term.Size) (err error) {
|
||||
// Use `docker attach` directly for in-process docker integration for
|
||||
// now to unblock other tests.
|
||||
// TODO: remove this hack after attach is defined in CRI.
|
||||
if ds, ok := m.runtimeService.(dockershim.DockerLegacyService); ok {
|
||||
return ds.AttachContainer(id, stdin, stdout, stderr, tty, resize)
|
||||
}
|
||||
return fmt.Errorf("not implemented")
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user