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

Merge pull request #342 from Random-Liu/update-kubernetes-containerd

Browse Source 
Update kubernetes and containerd.
This commit is contained in:
Lantao Liu
2017-10-11 00:23:24 -07:00
committed by GitHub
parent d50c610947 bde8b0517e
commit e4b818ff41
24 changed files with 549 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/server/container_create.go
View File

@@ -24,9 +24,11 @@ import (
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/contrib/apparmor"
"github.com/containerd/containerd/contrib/seccomp"
"github.com/containerd/containerd/linux/runcopts"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/typeurl"
"github.com/docker/docker/pkg/mount"
"github.com/golang/glog"
@@ -272,7 +274,7 @@ func (c *criContainerdService) CreateContainer(ctx context.Context, r *runtime.C
func (c *criContainerdService) generateContainerSpec(id string, sandboxPid uint32, config *runtime.ContainerConfig,
sandboxConfig *runtime.PodSandboxConfig, imageConfig *imagespec.ImageConfig, extraMounts []*runtime.Mount) (*runtimespec.Spec, error) {
// Creates a spec Generator with the default spec.
spec, err := defaultRuntimeSpec()
spec, err := defaultRuntimeSpec(id)
if err != nil {
return nil, err
}
@@ -721,8 +723,10 @@ func setOCINamespaces(g *generate.Generator, namespaces *runtime.NamespaceOption
}
// defaultRuntimeSpec returns a default runtime spec used in cri-containerd.
func defaultRuntimeSpec() (*runtimespec.Spec, error) {
spec, err := containerd.GenerateSpec(context.Background(), nil, nil)
func defaultRuntimeSpec(id string) (*runtimespec.Spec, error) {
// GenerateSpec needs namespace.
ctx := namespaces.WithNamespace(context.Background(), k8sContainerdNamespace)
spec, err := containerd.GenerateSpec(ctx, nil, &containers.Container{ID: id})
if err != nil {
return nil, err
}

2
pkg/server/container_create_test.go
View File

@@ -716,7 +716,7 @@ func TestPidNamespace(t *testing.T) {
}
func TestDefaultRuntimeSpec(t *testing.T) {
spec, err := defaultRuntimeSpec()
spec, err := defaultRuntimeSpec("test-id")
assert.NoError(t, err)
for _, mount := range spec.Mounts {
assert.NotEqual(t, "/run", mount.Destination)

2
pkg/server/sandbox_run.go
View File

@@ -230,7 +230,7 @@ func (c *criContainerdService) generateSandboxContainerSpec(id string, config *r
imageConfig *imagespec.ImageConfig, nsPath string) (*runtimespec.Spec, error) {
// Creates a spec Generator with the default spec.
// TODO(random-liu): [P1] Compare the default settings with docker and containerd default.
spec, err := defaultRuntimeSpec()
spec, err := defaultRuntimeSpec(id)
if err != nil {
return nil, err
}