github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Cleanup code.
This commit is contained in:
Lantao Liu 2017-06-02 09:18:47 -07:00 committed by GitHub
commit 264619a858
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/server/image_pull.go
View File

@ -186,7 +186,6 @@ func (r *resourceSet) all() map[string]struct{} {
// pullImage pulls image and returns image id (config digest) and manifest digest. // pullImage pulls image and returns image id (config digest) and manifest digest.
// The ref should be normalized image reference. // 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) ( func (c *criContainerdService) pullImage(ctx context.Context, ref string) (
imagedigest.Digest, imagedigest.Digest, error) { imagedigest.Digest, imagedigest.Digest, error) {
// Resolve the image reference to get descriptor and fetcher. // Resolve the image reference to get descriptor and fetcher.

1
pkg/server/sandbox_run.go
View File

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

12
pkg/server/service.go
View File

@ -40,18 +40,6 @@ import (
"github.com/kubernetes-incubator/cri-containerd/pkg/registrar" "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. // CRIContainerdService is the interface implement CRI remote service server.
type CRIContainerdService interface { type CRIContainerdService interface {
Start() Start()