Merge pull request #64 from Random-Liu/cleanup-code

Cleanup code.

pkg/server/image_pull.go

@@ -186,7 +186,6 @@ func (r *resourceSet) all() map[string]struct{} {
 
 // pullImage pulls image and returns image id (config digest) and manifest digest.
 // The ref should be normalized image reference.
-// TODO(random-liu): [P0] Wait for all downloadings to be done before return.
 func (c *criContainerdService) pullImage(ctx context.Context, ref string) (
 	imagedigest.Digest, imagedigest.Digest, error) {
 	// Resolve the image reference to get descriptor and fetcher.

pkg/server/sandbox_run.go

@@ -152,7 +152,6 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run
 			TypeUrl: runtimespec.Version,
 			Value:   rawSpec,
 		},
-		// TODO(random-liu): [P0] Get rootfs mount from containerd.
 		Rootfs:  rootfsMounts,
 		Runtime: defaultRuntime,
 		// No stdin for sandbox container.

pkg/server/service.go

@@ -40,18 +40,6 @@ import (
 	"github.com/kubernetes-incubator/cri-containerd/pkg/registrar"
 )
 
-// TODO remove the underscores from the following imports as the services are
-// implemented. "_" is being used to hold the reference to keep autocomplete
-// from deleting them until referenced below.
-// nolint: golint
-import (
-	_ "github.com/containerd/containerd/api/types/container"
-	_ "github.com/containerd/containerd/api/types/descriptor"
-	_ "github.com/containerd/containerd/api/types/mount"
-	_ "github.com/opencontainers/image-spec/specs-go"
-	_ "github.com/opencontainers/runtime-spec/specs-go"
-)
-
 // CRIContainerdService is the interface implement CRI remote service server.
 type CRIContainerdService interface {
 	Start()