Thanks to visit codestin.com
Credit goes to github.com

Skip to content

kata: support confidential container's api for pulling image in the guest #7471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Dec 19, 2023
Merged

kata: support confidential container's api for pulling image in the guest #7471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/intel/goresctrl v0.5.0
github.com/json-iterator/go v1.1.12
github.com/kata-containers/kata-containers/src/runtime v0.0.0-20231214145909-c7c763220340
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/gomega v1.30.0
github.com/opencontainers/go-digest v1.0.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
github.com/kata-containers/kata-containers/src/runtime v0.0.0-20231214145909-c7c763220340 h1:jcPu+nNmDGbXAE5tL7BCt2gNZyYcgnN+aatdEOYtTlY=
github.com/kata-containers/kata-containers/src/runtime v0.0.0-20231214145909-c7c763220340/go.mod h1:eKVh2ScPyeprBK6BdE75P6EsyWNazV/g3GXge+QZUIE=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
Expand Down
2 changes: 1 addition & 1 deletion internal/oci/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func (r *Runtime) newRuntimeImpl(c *Container) (RuntimeImpl, error) {
}

if rh.RuntimeType == config.RuntimeTypeVM {
return newRuntimeVM(rh.RuntimePath, rh.RuntimeRoot, rh.RuntimeConfigPath, r.config.RuntimeConfig.ContainerExitsDir), nil
return newRuntimeVM(rh, r.config.RuntimeConfig.ContainerExitsDir), nil
}

if rh.RuntimeType == config.RuntimeTypePod {
Expand Down
72 changes: 68 additions & 4 deletions internal/oci/runtime_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package oci

import (
"bytes"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"io"
Expand All @@ -16,6 +18,7 @@ import (
cgroupsV1 "github.com/containerd/cgroups/stats/v1"
cgroupsV2 "github.com/containerd/cgroups/v2/stats"
"github.com/containerd/containerd/api/runtime/task/v2"
containerdTypes "github.com/containerd/containerd/api/types"
tasktypes "github.com/containerd/containerd/api/types/task"
ctrio "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces"
Expand All @@ -28,11 +31,14 @@ import (
"github.com/containerd/ttrpc"
"github.com/containerd/typeurl"
conmonconfig "github.com/containers/conmon/runner/config"
"github.com/containers/podman/v4/pkg/annotations"
"github.com/cri-o/cri-o/internal/config/cgmgr"
"github.com/cri-o/cri-o/internal/log"
"github.com/cri-o/cri-o/pkg/config"
"github.com/cri-o/cri-o/server/metrics"
"github.com/cri-o/cri-o/utils"
"github.com/cri-o/cri-o/utils/errdefs"
katavolume "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
Expand All @@ -50,6 +56,7 @@ type runtimeVM struct {
fifoDir string
configPath string
exitsPath string
pullImage bool
ctx context.Context
client *ttrpc.Client
task task.TaskService
Expand All @@ -62,13 +69,17 @@ type containerInfo struct {
cio *cio.ContainerIO
}

const (
KataVirtualVolumeOptionName = "io.katacontainers.volume"
)

const (
execError = -1
execTimeout = -2
)

// newRuntimeVM creates a new runtimeVM instance
func newRuntimeVM(path, root, configPath, exitsPath string) RuntimeImpl {
func newRuntimeVM(handler *config.RuntimeHandler, exitsPath string) RuntimeImpl {
logrus.Debug("oci.newRuntimeVM() start")
defer logrus.Debug("oci.newRuntimeVM() end")

Expand All @@ -85,15 +96,51 @@ func newRuntimeVM(path, root, configPath, exitsPath string) RuntimeImpl {
typeurl.Register(&rspec.WindowsResources{}, prefix, "opencontainers/runtime-spec", major, "WindowsResources")

return &runtimeVM{
path: path,
configPath: configPath,
path: handler.RuntimePath,
configPath: handler.RuntimeConfigPath,
exitsPath: exitsPath,
fifoDir: filepath.Join(root, "crio", "fifo"),
pullImage: handler.RuntimePullImage,
fifoDir: filepath.Join(handler.RuntimeRoot, "crio", "fifo"),
ctx: context.Background(),
ctrs: make(map[string]containerInfo),
}
}

func addVolumeMountsToCreateRequest(ctx context.Context, request *task.CreateTaskRequest, c *Container) error {
// To make the kata agent pull the image{"volume_type":"image_guest_pull","source":"quay.io/kata-containers/confidential-containers:unsigned","fs_type":"overlayfs","image_pull":{"metadata":{}}}

imageSource := c.Spec().Annotations[annotations.ImageName]
log.Infof(ctx, "Adding mount info to pull image %s", imageSource)

volume := &katavolume.KataVirtualVolume{
VolumeType: katavolume.KataVirtualVolumeImageGuestPullType,
Source: imageSource,
FSType: "overlay_fs",
ImagePull: &katavolume.ImagePullVolume{Metadata: c.Spec().Annotations},
}
if !volume.IsValid() {
return fmt.Errorf("got invalid kata volume, %v", volume)
}

info, err := EncodeKataVirtualVolumeToBase64(ctx, volume)
if err != nil {
return fmt.Errorf("failed to encode Kata Volume info %v: %w", volume, err)
}

log.Infof(ctx, "CoCo : Mount volume information: %v (encoded: %v)", volume, info)

opt := fmt.Sprintf("%s=%s", KataVirtualVolumeOptionName, info)

request.Rootfs = append(request.Rootfs, &containerdTypes.Mount{
// we don't actually use nydus, but this string is what makes the kata
// shim check for the extended options and ignore the mount, passing the
// information to the kata agent instead.
Type: "fuse.nydus-overlayfs",
Options: []string{opt},
})
return nil
}

// CreateContainer creates a container.
func (r *runtimeVM) CreateContainer(ctx context.Context, c *Container, cgroupParent string, restore bool) (retErr error) {
log.Debugf(ctx, "RuntimeVM.CreateContainer() start")
Expand Down Expand Up @@ -154,6 +201,13 @@ func (r *runtimeVM) CreateContainer(ctx context.Context, c *Container, cgroupPar
Options: opts,
}

if r.pullImage {
err := addVolumeMountsToCreateRequest(ctx, request, c)
if err != nil {
log.Warnf(ctx, "Failed to add KataVirtualVolume information to CreateContainer: %v", err)
}
}

createdCh := make(chan error)
go func() {
// Create the container
Expand Down Expand Up @@ -1176,3 +1230,13 @@ func (r *runtimeVM) RestoreContainer(ctx context.Context, c *Container, cgroupPa

return errors.New("restoring not implemented for runtimeVM")
}

func EncodeKataVirtualVolumeToBase64(ctx context.Context, volume *katavolume.KataVirtualVolume) (string, error) {
validKataVirtualVolumeJSON, err := json.Marshal(volume)
if err != nil {
return "", fmt.Errorf("marshal KataVirtualVolume object; error=%w", err)
}
log.Infof(ctx, "Encode kata volume %v", validKataVirtualVolumeJSON)
option := base64.StdEncoding.EncodeToString(validKataVirtualVolumeJSON)
return option, nil
}
4 changes: 4 additions & 0 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ type RuntimeHandler struct {
// the runtime paths for different platforms.
PlatformRuntimePaths map[string]string `toml:"platform_runtime_paths,omitempty"`

// Marks the runtime as performing image pulling on its own, and doesn't
// require crio to do it.
RuntimePullImage bool `toml:"runtime_pull_image,omitempty"`

// Output of the "features" subcommand.
// This is populated dynamically and not read from config.
features features.Features
Expand Down
201 changes: 201 additions & 0 deletions vendor/github.com/kata-containers/kata-containers/src/runtime/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading