
This change does a couple things to remove some cruft/unused functionality in the Windows snapshotter, as well as add a way to specify the rootfs size in bytes for a Windows container via a new field added in the CRI api in k8s 1.24. Setting the rootfs/scratch volume size was assumed to be working prior to this but turns out not to be the case. Previously I'd added a change to pass any annotations in the containerd snapshot form (containerd.io/snapshot/*) as labels for the containers rootfs snapshot. This was added as a means for a client to be able to provide containerd.io/snapshot/io.microsoft.container.storage.rootfs.size-gb as an annotation and have that be translated to a label and ultimately set the size for the scratch volume in Windows. However, this actually only worked if interfacing with the CRI api directly (crictl) as Kubernetes itself will fail to validate annotations that if split by "/" end up with > 2 parts, which the snapshot labels will (containerd.io / snapshot / foobarbaz). With this in mind, passing the annotations and filtering to containerd.io/snapshot/* is moot, so I've removed this code in favor of a new `snapshotterOpts()` function that will return platform specific snapshotter options if ones exist. Now on Windows we can just check if RootfsSizeInBytes is set on the WindowsContainerResources struct and then return a snapshotter option that sets the right label. So all in all this change: - Gets rid of code to pass CRI annotations as labels down to snapshotters. - Gets rid of the functionality to create a 1GB sized scratch disk if the client provided a size < 20GB. This code is not used currently and has a few logical shortcomings as it won't be able to create the disk if a container is already running and using the same base layer. WCIFS (driver that handles the unioning of windows container layers together) holds open handles to some files that we need to delete to create the 1GB scratch disk is the underlying problem. - Deprecates the containerd.io/snapshot/io.microsoft.container.storage.rootfs.size-gb label in favor of a new containerd.io/snapshot/windows/rootfs.sizebytes label. The previous label/annotation wasn't being used by us, and from a cursory github search wasn't being used by anyone else either. Now that there is a CRI field to specify the size, this should just be a field that users can set on their pod specs and don't need to concern themselves with what it eventually gets translated to, but non-CRI clients can still use the new label/deprecated label as usual. - Add test to cri integration suite to validate expanding the rootfs size. Signed-off-by: Daniel Canter <dcanter@microsoft.com>
509 lines
15 KiB
Go
509 lines
15 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 integration
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
goruntime "runtime"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/containerd/containerd"
|
|
cri "github.com/containerd/containerd/integration/cri-api/pkg/apis"
|
|
"github.com/containerd/containerd/integration/remote"
|
|
dialer "github.com/containerd/containerd/integration/remote/util"
|
|
criconfig "github.com/containerd/containerd/pkg/cri/config"
|
|
"github.com/containerd/containerd/pkg/cri/constants"
|
|
"github.com/containerd/containerd/pkg/cri/server"
|
|
"github.com/containerd/containerd/pkg/cri/util"
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
exec "golang.org/x/sys/execabs"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/credentials/insecure"
|
|
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
)
|
|
|
|
const (
|
|
timeout = 1 * time.Minute
|
|
k8sNamespace = constants.K8sContainerdNamespace
|
|
)
|
|
|
|
var (
|
|
runtimeService cri.RuntimeService
|
|
containerdClient *containerd.Client
|
|
containerdEndpoint string
|
|
)
|
|
|
|
var criEndpoint = flag.String("cri-endpoint", "unix:///run/containerd/containerd.sock", "The endpoint of cri plugin.")
|
|
var criRoot = flag.String("cri-root", "/var/lib/containerd/io.containerd.grpc.v1.cri", "The root directory of cri plugin.")
|
|
var runtimeHandler = flag.String("runtime-handler", "", "The runtime handler to use in the test.")
|
|
var containerdBin = flag.String("containerd-bin", "containerd", "The containerd binary name. The name is used to restart containerd during test.")
|
|
var imageListFile = flag.String("image-list", "", "The TOML file containing the non-default images to be used in tests.")
|
|
|
|
func TestMain(m *testing.M) {
|
|
flag.Parse()
|
|
initImages(*imageListFile)
|
|
if err := ConnectDaemons(); err != nil {
|
|
logrus.WithError(err).Fatalf("Failed to connect daemons")
|
|
}
|
|
os.Exit(m.Run())
|
|
}
|
|
|
|
// ConnectDaemons connect cri plugin and containerd, and initialize the clients.
|
|
func ConnectDaemons() error {
|
|
var err error
|
|
runtimeService, err = remote.NewRuntimeService(*criEndpoint, timeout)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create runtime service: %w", err)
|
|
}
|
|
imageService, err = remote.NewImageService(*criEndpoint, timeout)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create image service: %w", err)
|
|
}
|
|
// Since CRI grpc client doesn't have `WithBlock` specified, we
|
|
// need to check whether it is actually connected.
|
|
// TODO(#6069) Use grpc options to block on connect and remove for this list containers request.
|
|
_, err = runtimeService.ListContainers(&runtime.ContainerFilter{})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to list containers: %w", err)
|
|
}
|
|
_, err = imageService.ListImages(&runtime.ImageFilter{})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to list images: %w", err)
|
|
}
|
|
// containerdEndpoint is the same with criEndpoint now
|
|
containerdEndpoint = strings.TrimPrefix(*criEndpoint, "unix://")
|
|
containerdEndpoint = strings.TrimPrefix(containerdEndpoint, "npipe:")
|
|
containerdClient, err = containerd.New(containerdEndpoint, containerd.WithDefaultNamespace(k8sNamespace))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to connect containerd: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Opts sets specific information in pod sandbox config.
|
|
type PodSandboxOpts func(*runtime.PodSandboxConfig)
|
|
|
|
// Set host network.
|
|
func WithHostNetwork(p *runtime.PodSandboxConfig) {
|
|
if p.Linux == nil {
|
|
p.Linux = &runtime.LinuxPodSandboxConfig{}
|
|
}
|
|
if p.Linux.SecurityContext == nil {
|
|
p.Linux.SecurityContext = &runtime.LinuxSandboxSecurityContext{}
|
|
}
|
|
if p.Linux.SecurityContext.NamespaceOptions == nil {
|
|
p.Linux.SecurityContext.NamespaceOptions = &runtime.NamespaceOption{}
|
|
}
|
|
p.Linux.SecurityContext.NamespaceOptions.Network = runtime.NamespaceMode_NODE
|
|
}
|
|
|
|
// Set host pid.
|
|
func WithHostPid(p *runtime.PodSandboxConfig) {
|
|
if p.Linux == nil {
|
|
p.Linux = &runtime.LinuxPodSandboxConfig{}
|
|
}
|
|
if p.Linux.SecurityContext == nil {
|
|
p.Linux.SecurityContext = &runtime.LinuxSandboxSecurityContext{}
|
|
}
|
|
if p.Linux.SecurityContext.NamespaceOptions == nil {
|
|
p.Linux.SecurityContext.NamespaceOptions = &runtime.NamespaceOption{}
|
|
}
|
|
p.Linux.SecurityContext.NamespaceOptions.Pid = runtime.NamespaceMode_NODE
|
|
}
|
|
|
|
// Set pod pid.
|
|
func WithPodPid(p *runtime.PodSandboxConfig) {
|
|
if p.Linux == nil {
|
|
p.Linux = &runtime.LinuxPodSandboxConfig{}
|
|
}
|
|
if p.Linux.SecurityContext == nil {
|
|
p.Linux.SecurityContext = &runtime.LinuxSandboxSecurityContext{}
|
|
}
|
|
if p.Linux.SecurityContext.NamespaceOptions == nil {
|
|
p.Linux.SecurityContext.NamespaceOptions = &runtime.NamespaceOption{}
|
|
}
|
|
p.Linux.SecurityContext.NamespaceOptions.Pid = runtime.NamespaceMode_POD
|
|
}
|
|
|
|
// Add pod log directory.
|
|
func WithPodLogDirectory(dir string) PodSandboxOpts {
|
|
return func(p *runtime.PodSandboxConfig) {
|
|
p.LogDirectory = dir
|
|
}
|
|
}
|
|
|
|
// Add pod hostname.
|
|
func WithPodHostname(hostname string) PodSandboxOpts {
|
|
return func(p *runtime.PodSandboxConfig) {
|
|
p.Hostname = hostname
|
|
}
|
|
}
|
|
|
|
// PodSandboxConfig generates a pod sandbox config for test.
|
|
func PodSandboxConfig(name, ns string, opts ...PodSandboxOpts) *runtime.PodSandboxConfig {
|
|
config := &runtime.PodSandboxConfig{
|
|
Metadata: &runtime.PodSandboxMetadata{
|
|
Name: name,
|
|
// Using random id as uuid is good enough for local
|
|
// integration test.
|
|
Uid: util.GenerateID(),
|
|
Namespace: Randomize(ns),
|
|
},
|
|
Linux: &runtime.LinuxPodSandboxConfig{},
|
|
}
|
|
for _, opt := range opts {
|
|
opt(config)
|
|
}
|
|
return config
|
|
}
|
|
|
|
func PodSandboxConfigWithCleanup(t *testing.T, name, ns string, opts ...PodSandboxOpts) (string, *runtime.PodSandboxConfig) {
|
|
sbConfig := PodSandboxConfig(name, ns, opts...)
|
|
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
|
|
require.NoError(t, err)
|
|
t.Cleanup(func() {
|
|
assert.NoError(t, runtimeService.StopPodSandbox(sb))
|
|
assert.NoError(t, runtimeService.RemovePodSandbox(sb))
|
|
})
|
|
|
|
return sb, sbConfig
|
|
}
|
|
|
|
// Set Windows HostProcess on the pod.
|
|
func WithWindowsHostProcessPod(p *runtime.PodSandboxConfig) { //nolint:unused
|
|
if p.Windows == nil {
|
|
p.Windows = &runtime.WindowsPodSandboxConfig{}
|
|
}
|
|
if p.Windows.SecurityContext == nil {
|
|
p.Windows.SecurityContext = &runtime.WindowsSandboxSecurityContext{}
|
|
}
|
|
p.Windows.SecurityContext.HostProcess = true
|
|
}
|
|
|
|
// ContainerOpts to set any specific attribute like labels,
|
|
// annotations, metadata etc
|
|
type ContainerOpts func(*runtime.ContainerConfig)
|
|
|
|
func WithTestLabels() ContainerOpts {
|
|
return func(c *runtime.ContainerConfig) {
|
|
c.Labels = map[string]string{"key": "value"}
|
|
}
|
|
}
|
|
|
|
func WithTestAnnotations() ContainerOpts {
|
|
return func(c *runtime.ContainerConfig) {
|
|
c.Annotations = map[string]string{"a.b.c": "test"}
|
|
}
|
|
}
|
|
|
|
// Add container resource limits.
|
|
func WithResources(r *runtime.LinuxContainerResources) ContainerOpts { //nolint:unused
|
|
return func(c *runtime.ContainerConfig) {
|
|
if c.Linux == nil {
|
|
c.Linux = &runtime.LinuxContainerConfig{}
|
|
}
|
|
c.Linux.Resources = r
|
|
}
|
|
}
|
|
|
|
// Adds Windows container resource limits.
|
|
func WithWindowsResources(r *runtime.WindowsContainerResources) ContainerOpts { //nolint:unused
|
|
return func(c *runtime.ContainerConfig) {
|
|
if c.Windows == nil {
|
|
c.Windows = &runtime.WindowsContainerConfig{}
|
|
}
|
|
c.Windows.Resources = r
|
|
}
|
|
}
|
|
|
|
func WithVolumeMount(hostPath, containerPath string) ContainerOpts {
|
|
return func(c *runtime.ContainerConfig) {
|
|
hostPath, _ = filepath.Abs(hostPath)
|
|
containerPath, _ = filepath.Abs(containerPath)
|
|
mount := &runtime.Mount{HostPath: hostPath, ContainerPath: containerPath}
|
|
c.Mounts = append(c.Mounts, mount)
|
|
}
|
|
}
|
|
|
|
func WithWindowsUsername(username string) ContainerOpts { //nolint:unused
|
|
return func(c *runtime.ContainerConfig) {
|
|
if c.Windows == nil {
|
|
c.Windows = &runtime.WindowsContainerConfig{}
|
|
}
|
|
if c.Windows.SecurityContext == nil {
|
|
c.Windows.SecurityContext = &runtime.WindowsContainerSecurityContext{}
|
|
}
|
|
c.Windows.SecurityContext.RunAsUsername = username
|
|
}
|
|
}
|
|
|
|
func WithWindowsHostProcessContainer() ContainerOpts { //nolint:unused
|
|
return func(c *runtime.ContainerConfig) {
|
|
if c.Windows == nil {
|
|
c.Windows = &runtime.WindowsContainerConfig{}
|
|
}
|
|
if c.Windows.SecurityContext == nil {
|
|
c.Windows.SecurityContext = &runtime.WindowsContainerSecurityContext{}
|
|
}
|
|
c.Windows.SecurityContext.HostProcess = true
|
|
}
|
|
}
|
|
|
|
// Add container command.
|
|
func WithCommand(cmd string, args ...string) ContainerOpts {
|
|
return func(c *runtime.ContainerConfig) {
|
|
c.Command = []string{cmd}
|
|
c.Args = args
|
|
}
|
|
}
|
|
|
|
// Add pid namespace mode.
|
|
func WithPidNamespace(mode runtime.NamespaceMode) ContainerOpts {
|
|
return func(c *runtime.ContainerConfig) {
|
|
if c.Linux == nil {
|
|
c.Linux = &runtime.LinuxContainerConfig{}
|
|
}
|
|
if c.Linux.SecurityContext == nil {
|
|
c.Linux.SecurityContext = &runtime.LinuxContainerSecurityContext{}
|
|
}
|
|
if c.Linux.SecurityContext.NamespaceOptions == nil {
|
|
c.Linux.SecurityContext.NamespaceOptions = &runtime.NamespaceOption{}
|
|
}
|
|
c.Linux.SecurityContext.NamespaceOptions.Pid = mode
|
|
}
|
|
|
|
}
|
|
|
|
// Add container log path.
|
|
func WithLogPath(path string) ContainerOpts {
|
|
return func(c *runtime.ContainerConfig) {
|
|
c.LogPath = path
|
|
}
|
|
}
|
|
|
|
// WithSupplementalGroups adds supplemental groups.
|
|
func WithSupplementalGroups(gids []int64) ContainerOpts { //nolint:unused
|
|
return func(c *runtime.ContainerConfig) {
|
|
if c.Linux == nil {
|
|
c.Linux = &runtime.LinuxContainerConfig{}
|
|
}
|
|
if c.Linux.SecurityContext == nil {
|
|
c.Linux.SecurityContext = &runtime.LinuxContainerSecurityContext{}
|
|
}
|
|
c.Linux.SecurityContext.SupplementalGroups = gids
|
|
}
|
|
}
|
|
|
|
// WithDevice adds a device mount.
|
|
func WithDevice(containerPath, hostPath, permissions string) ContainerOpts { //nolint:unused
|
|
return func(c *runtime.ContainerConfig) {
|
|
c.Devices = append(c.Devices, &runtime.Device{
|
|
ContainerPath: containerPath, HostPath: hostPath, Permissions: permissions,
|
|
})
|
|
}
|
|
}
|
|
|
|
// ContainerConfig creates a container config given a name and image name
|
|
// and additional container config options
|
|
func ContainerConfig(name, image string, opts ...ContainerOpts) *runtime.ContainerConfig {
|
|
cConfig := &runtime.ContainerConfig{
|
|
Metadata: &runtime.ContainerMetadata{
|
|
Name: name,
|
|
},
|
|
Image: &runtime.ImageSpec{Image: image},
|
|
}
|
|
for _, opt := range opts {
|
|
opt(cConfig)
|
|
}
|
|
return cConfig
|
|
}
|
|
|
|
// CheckFunc is the function used to check a condition is true/false.
|
|
type CheckFunc func() (bool, error)
|
|
|
|
// Eventually waits for f to return true, it checks every period, and
|
|
// returns error if timeout exceeds. If f returns error, Eventually
|
|
// will return the same error immediately.
|
|
func Eventually(f CheckFunc, period, timeout time.Duration) error {
|
|
start := time.Now()
|
|
for {
|
|
done, err := f()
|
|
if done {
|
|
return nil
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if time.Since(start) >= timeout {
|
|
return errors.New("timeout exceeded")
|
|
}
|
|
time.Sleep(period)
|
|
}
|
|
}
|
|
|
|
// Consistently makes sure that f consistently returns true without
|
|
// error before timeout exceeds. If f returns error, Consistently
|
|
// will return the same error immediately.
|
|
func Consistently(f CheckFunc, period, timeout time.Duration) error {
|
|
start := time.Now()
|
|
for {
|
|
ok, err := f()
|
|
if !ok {
|
|
return errors.New("get false")
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if time.Since(start) >= timeout {
|
|
return nil
|
|
}
|
|
time.Sleep(period)
|
|
}
|
|
}
|
|
|
|
// Randomize adds uuid after a string.
|
|
func Randomize(str string) string {
|
|
return str + "-" + util.GenerateID()
|
|
}
|
|
|
|
// KillProcess kills the process by name. pkill is used.
|
|
func KillProcess(name string) error {
|
|
var command []string
|
|
if goruntime.GOOS == "windows" {
|
|
command = []string{"taskkill", "/IM", name, "/F"}
|
|
} else {
|
|
command = []string{"pkill", "-x", fmt.Sprintf("^%s$", name)}
|
|
}
|
|
|
|
output, err := exec.Command(command[0], command[1:]...).CombinedOutput()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to kill %q - error: %v, output: %q", name, err, output)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// KillPid kills the process by pid. kill is used.
|
|
func KillPid(pid int) error {
|
|
command := "kill"
|
|
if goruntime.GOOS == "windows" {
|
|
command = "tskill"
|
|
}
|
|
output, err := exec.Command(command, strconv.Itoa(pid)).CombinedOutput()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to kill %d - error: %v, output: %q", pid, err, output)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// PidOf returns pid of a process by name.
|
|
func PidOf(name string) (int, error) {
|
|
b, err := exec.Command("pidof", "-s", name).CombinedOutput()
|
|
output := strings.TrimSpace(string(b))
|
|
if err != nil {
|
|
if len(output) != 0 {
|
|
return 0, fmt.Errorf("failed to run pidof %q - error: %v, output: %q", name, err, output)
|
|
}
|
|
return 0, nil
|
|
}
|
|
return strconv.Atoi(output)
|
|
}
|
|
|
|
// RawRuntimeClient returns a raw grpc runtime service client.
|
|
func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {
|
|
addr, dialer, err := dialer.GetAddressAndDialer(*criEndpoint)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to get dialer: %w", err)
|
|
}
|
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
|
defer cancel()
|
|
conn, err := grpc.DialContext(ctx, addr,
|
|
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
|
grpc.WithContextDialer(dialer),
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to connect cri endpoint: %w", err)
|
|
}
|
|
return runtime.NewRuntimeServiceClient(conn), nil
|
|
}
|
|
|
|
// CRIConfig gets current cri config from containerd.
|
|
func CRIConfig() (*criconfig.Config, error) {
|
|
client, err := RawRuntimeClient()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to get raw runtime client: %w", err)
|
|
}
|
|
resp, err := client.Status(context.Background(), &runtime.StatusRequest{Verbose: true})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to get status: %w", err)
|
|
}
|
|
config := &criconfig.Config{}
|
|
if err := json.Unmarshal([]byte(resp.Info["config"]), config); err != nil {
|
|
return nil, fmt.Errorf("failed to unmarshal config: %w", err)
|
|
}
|
|
return config, nil
|
|
}
|
|
|
|
// SandboxInfo gets sandbox info.
|
|
func SandboxInfo(id string) (*runtime.PodSandboxStatus, *server.SandboxInfo, error) { //nolint:unused
|
|
client, err := RawRuntimeClient()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to get raw runtime client: %w", err)
|
|
}
|
|
resp, err := client.PodSandboxStatus(context.Background(), &runtime.PodSandboxStatusRequest{
|
|
PodSandboxId: id,
|
|
Verbose: true,
|
|
})
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to get sandbox status: %w", err)
|
|
}
|
|
status := resp.GetStatus()
|
|
var info server.SandboxInfo
|
|
if err := json.Unmarshal([]byte(resp.GetInfo()["info"]), &info); err != nil {
|
|
return nil, nil, fmt.Errorf("failed to unmarshal sandbox info: %w", err)
|
|
}
|
|
return status, &info, nil
|
|
}
|
|
|
|
func RestartContainerd(t *testing.T) {
|
|
require.NoError(t, KillProcess(*containerdBin))
|
|
|
|
// Use assert so that the 3rd wait always runs, this makes sure
|
|
// containerd is running before this function returns.
|
|
assert.NoError(t, Eventually(func() (bool, error) {
|
|
pid, err := PidOf(*containerdBin)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return pid == 0, nil
|
|
}, time.Second, 30*time.Second), "wait for containerd to be killed")
|
|
|
|
require.NoError(t, Eventually(func() (bool, error) {
|
|
return ConnectDaemons() == nil, nil
|
|
}, time.Second, 30*time.Second), "wait for containerd to be restarted")
|
|
}
|