
Currently, there are few issues that preventing containers with image volumes to properly start on Windows. - Unlike the Linux implementation, the Container volume mount paths were not created if they didn't exist. Those paths are now created. - while copying the image volume contents to the container volume, the layers were not properly deactivated, which means that the container can't start since those layers are still open. The layers are now properly deactivated, allowing the container to start. - even if the above issue didn't exist, the Windows implementation of mount/Mount.Mount deactivates the layers, which wouldn't allow us to copy files from them. The layers are now deactivated after we've copied the necessary files from them. - the target argument of the Windows implementation of mount/Mount.Mount was unused, which means that folder was always empty. We're now symlinking the Layer Mount Path into the target folder. - hcsshim needs its Container Mount Paths to be properly formated, to be prefixed by C:. This was an issue for Volumes defined with Linux-like paths (e.g.: /test_dir). filepath.Abs solves this issue. Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
233 lines
7.1 KiB
Go
233 lines
7.1 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package opts
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/containerd/containerd/containers"
|
|
"github.com/containerd/containerd/oci"
|
|
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
|
|
"github.com/pkg/errors"
|
|
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
|
|
osinterface "github.com/containerd/containerd/pkg/os"
|
|
)
|
|
|
|
// WithWindowsNetworkNamespace sets windows network namespace for container.
|
|
// TODO(windows): Move this into container/containerd.
|
|
func WithWindowsNetworkNamespace(path string) oci.SpecOpts {
|
|
return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) error {
|
|
if s.Windows == nil {
|
|
s.Windows = &runtimespec.Windows{}
|
|
}
|
|
if s.Windows.Network == nil {
|
|
s.Windows.Network = &runtimespec.WindowsNetwork{}
|
|
}
|
|
s.Windows.Network.NetworkNamespace = path
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// namedPipePath returns true if the given path is to a named pipe.
|
|
func namedPipePath(p string) bool {
|
|
return strings.HasPrefix(p, `\\.\pipe\`)
|
|
}
|
|
|
|
// cleanMount returns a cleaned version of the mount path. The input is returned
|
|
// as-is if it is a named pipe path.
|
|
func cleanMount(p string) string {
|
|
if namedPipePath(p) {
|
|
return p
|
|
}
|
|
return filepath.Clean(p)
|
|
}
|
|
|
|
// WithWindowsMounts sorts and adds runtime and CRI mounts to the spec for
|
|
// windows container.
|
|
func WithWindowsMounts(osi osinterface.OS, config *runtime.ContainerConfig, extra []*runtime.Mount) oci.SpecOpts {
|
|
return func(ctx context.Context, client oci.Client, _ *containers.Container, s *runtimespec.Spec) error {
|
|
// mergeMounts merge CRI mounts with extra mounts. If a mount destination
|
|
// is mounted by both a CRI mount and an extra mount, the CRI mount will
|
|
// be kept.
|
|
var (
|
|
criMounts = config.GetMounts()
|
|
mounts = append([]*runtime.Mount{}, criMounts...)
|
|
)
|
|
// Copy all mounts from extra mounts, except for mounts overridden by CRI.
|
|
for _, e := range extra {
|
|
found := false
|
|
for _, c := range criMounts {
|
|
if cleanMount(e.ContainerPath) == cleanMount(c.ContainerPath) {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
mounts = append(mounts, e)
|
|
}
|
|
}
|
|
|
|
// Sort mounts in number of parts. This ensures that high level mounts don't
|
|
// shadow other mounts.
|
|
sort.Sort(orderedMounts(mounts))
|
|
|
|
// Copy all mounts from default mounts, except for
|
|
// mounts overridden by supplied mount;
|
|
mountSet := make(map[string]struct{})
|
|
for _, m := range mounts {
|
|
mountSet[cleanMount(m.ContainerPath)] = struct{}{}
|
|
}
|
|
|
|
defaultMounts := s.Mounts
|
|
s.Mounts = nil
|
|
|
|
for _, m := range defaultMounts {
|
|
dst := cleanMount(m.Destination)
|
|
if _, ok := mountSet[dst]; ok {
|
|
// filter out mount overridden by a supplied mount
|
|
continue
|
|
}
|
|
s.Mounts = append(s.Mounts, m)
|
|
}
|
|
|
|
for _, mount := range mounts {
|
|
var (
|
|
dst = mount.GetContainerPath()
|
|
src = mount.GetHostPath()
|
|
)
|
|
// In the case of a named pipe mount on Windows, don't stat the file
|
|
// or do other operations that open it, as that could interfere with
|
|
// the listening process. filepath.Clean also breaks named pipe
|
|
// paths, so don't use it.
|
|
if !namedPipePath(src) {
|
|
if _, err := osi.Stat(src); err != nil {
|
|
// Create the host path if it doesn't exist. This will align
|
|
// the behavior with the Linux implementation, but it doesn't
|
|
// align with Docker's behavior on Windows.
|
|
if !os.IsNotExist(err) {
|
|
return errors.Wrapf(err, "failed to stat %q", src)
|
|
}
|
|
if err := osi.MkdirAll(src, 0755); err != nil {
|
|
return errors.Wrapf(err, "failed to mkdir %q", src)
|
|
}
|
|
}
|
|
var err error
|
|
src, err = osi.ResolveSymbolicLink(src)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "failed to resolve symlink %q", src)
|
|
}
|
|
// hcsshim requires clean path, especially '/' -> '\'. Additionally,
|
|
// for the destination, absolute paths should have the C: prefix.
|
|
src = filepath.Clean(src)
|
|
dst = filepath.Clean(dst)
|
|
if dst[0] == '\\' {
|
|
dst = "C:" + dst
|
|
}
|
|
}
|
|
|
|
var options []string
|
|
// NOTE(random-liu): we don't change all mounts to `ro` when root filesystem
|
|
// is readonly. This is different from docker's behavior, but make more sense.
|
|
if mount.GetReadonly() {
|
|
options = append(options, "ro")
|
|
} else {
|
|
options = append(options, "rw")
|
|
}
|
|
s.Mounts = append(s.Mounts, runtimespec.Mount{
|
|
Source: src,
|
|
Destination: dst,
|
|
Options: options,
|
|
})
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithWindowsResources sets the provided resource restrictions for windows.
|
|
func WithWindowsResources(resources *runtime.WindowsContainerResources) oci.SpecOpts {
|
|
return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) error {
|
|
if resources == nil {
|
|
return nil
|
|
}
|
|
if s.Windows == nil {
|
|
s.Windows = &runtimespec.Windows{}
|
|
}
|
|
if s.Windows.Resources == nil {
|
|
s.Windows.Resources = &runtimespec.WindowsResources{}
|
|
}
|
|
if s.Windows.Resources.Memory == nil {
|
|
s.Windows.Resources.Memory = &runtimespec.WindowsMemoryResources{}
|
|
}
|
|
|
|
var (
|
|
count = uint64(resources.GetCpuCount())
|
|
shares = uint16(resources.GetCpuShares())
|
|
max = uint16(resources.GetCpuMaximum())
|
|
limit = uint64(resources.GetMemoryLimitInBytes())
|
|
)
|
|
if s.Windows.Resources.CPU == nil && (count != 0 || shares != 0 || max != 0) {
|
|
s.Windows.Resources.CPU = &runtimespec.WindowsCPUResources{}
|
|
}
|
|
if count != 0 {
|
|
s.Windows.Resources.CPU.Count = &count
|
|
}
|
|
if shares != 0 {
|
|
s.Windows.Resources.CPU.Shares = &shares
|
|
}
|
|
if max != 0 {
|
|
s.Windows.Resources.CPU.Maximum = &max
|
|
}
|
|
if limit != 0 {
|
|
s.Windows.Resources.Memory.Limit = &limit
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithWindowsDefaultSandboxShares sets the default sandbox CPU shares
|
|
func WithWindowsDefaultSandboxShares(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) error {
|
|
if s.Windows == nil {
|
|
s.Windows = &runtimespec.Windows{}
|
|
}
|
|
if s.Windows.Resources == nil {
|
|
s.Windows.Resources = &runtimespec.WindowsResources{}
|
|
}
|
|
if s.Windows.Resources.CPU == nil {
|
|
s.Windows.Resources.CPU = &runtimespec.WindowsCPUResources{}
|
|
}
|
|
i := uint16(DefaultSandboxCPUshares)
|
|
s.Windows.Resources.CPU.Shares = &i
|
|
return nil
|
|
}
|
|
|
|
// WithWindowsCredentialSpec assigns `credentialSpec` to the
|
|
// `runtime.Spec.Windows.CredentialSpec` field.
|
|
func WithWindowsCredentialSpec(credentialSpec string) oci.SpecOpts {
|
|
return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) error {
|
|
if s.Windows == nil {
|
|
s.Windows = &runtimespec.Windows{}
|
|
}
|
|
s.Windows.CredentialSpec = credentialSpec
|
|
return nil
|
|
}
|
|
}
|