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

Merge pull request #33815 from Random-Liu/add-cri-fake-attach
918e99e2 · Kubernetes Submit Queue · GitHub · b20765f5 · e2a994a4 · 918e99e2
Commit 918e99e2 authored Sep 30, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

kuberuntime_container.go pkg/kubelet/kuberuntime/kuberuntime_container.go +6 -0

No files found.
--- a/pkg/kubelet/kuberuntime/kuberuntime_container.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go
@@ -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")
 }