Add container attach support.

Signed-off-by: Lantao Liu <lantaol@google.com>

pkg/store/container/container.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/containerd/containerd"
 
+	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
 	"github.com/kubernetes-incubator/cri-containerd/pkg/store"
 )
 
@@ -33,6 +34,9 @@ type Container struct {
 	Status StatusStorage
 	// Containerd container
 	Container containerd.Container
+	// Container IO
+	IO *cio.ContainerIO
+	// TODO(random-liu): Add stop channel to get rid of stop poll waiting.
 }
 
 // Opts sets specific information to newly created Container.
@@ -45,6 +49,13 @@ func WithContainer(cntr containerd.Container) Opts {
 	}
 }
 
+// WithContainerIO adds IO into the container.
+func WithContainerIO(io *cio.ContainerIO) Opts {
+	return func(c *Container) {
+		c.IO = io
+	}
+}
+
 // NewContainer creates an internally used container type.
 func NewContainer(metadata Metadata, status Status, opts ...Opts) (Container, error) {
 	s, err := StoreStatus(metadata.ID, status)
@@ -55,7 +66,6 @@ func NewContainer(metadata Metadata, status Status, opts ...Opts) (Container, er
 		Metadata: metadata,
 		Status:   s,
 	}
-
 	for _, o := range opts {
 		o(&c)
 	}

pkg/store/container/container_test.go

@@ -23,6 +23,7 @@ import (
 	assertlib "github.com/stretchr/testify/assert"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
+	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
 	"github.com/kubernetes-incubator/cri-containerd/pkg/store"
 )
 
@@ -136,3 +137,36 @@ func TestContainerStore(t *testing.T) {
 	assert.Equal(Container{}, c)
 	assert.Equal(store.ErrNotExist, err)
 }
+
+func TestWithContainerIO(t *testing.T) {
+	meta := Metadata{
+		ID:        "1",
+		Name:      "Container-1",
+		SandboxID: "Sandbox-1",
+		Config: &runtime.ContainerConfig{
+			Metadata: &runtime.ContainerMetadata{
+				Name:    "TestPod-1",
+				Attempt: 1,
+			},
+		},
+		ImageRef: "TestImage-1",
+	}
+	status := Status{
+		Pid:        1,
+		CreatedAt:  time.Now().UnixNano(),
+		StartedAt:  time.Now().UnixNano(),
+		FinishedAt: time.Now().UnixNano(),
+		ExitCode:   1,
+		Reason:     "TestReason-1",
+		Message:    "TestMessage-1",
+	}
+	assert := assertlib.New(t)
+
+	c, err := NewContainer(meta, status)
+	assert.NoError(err)
+	assert.Nil(c.IO)
+
+	c, err = NewContainer(meta, status, WithContainerIO(&cio.ContainerIO{}))
+	assert.NoError(err)
+	assert.NotNil(c.IO)
+}