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

Merge pull request #10273 from thaJeztah/remove_use_of_platform_alias

Browse Source 
remove uses of platforms.Platform alias
This commit is contained in:
Samuel Karp 2024-05-28 17:29:40 +00:00 committed by GitHub
commit e32090e044
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/sandbox/controller.go
View File

@ -23,8 +23,8 @@ import (
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/platforms"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
) )
type CreateOptions struct { type CreateOptions struct {
@ -99,7 +99,7 @@ type Controller interface {
Start(ctx context.Context, sandboxID string) (ControllerInstance, error) Start(ctx context.Context, sandboxID string) (ControllerInstance, error)
// Platform returns target sandbox OS that will be used by Controller. // Platform returns target sandbox OS that will be used by Controller.
// containerd will rely on this to generate proper OCI spec. // containerd will rely on this to generate proper OCI spec.
Platform(_ctx context.Context, _sandboxID string) (platforms.Platform, error) Platform(_ctx context.Context, _sandboxID string) (imagespec.Platform, error)
// Stop will stop sandbox instance // Stop will stop sandbox instance
Stop(ctx context.Context, sandboxID string, opts ...StopOpt) error Stop(ctx context.Context, sandboxID string, opts ...StopOpt) error
// Wait blocks until sandbox process exits. // Wait blocks until sandbox process exits.

8
core/sandbox/proxy/controller.go
View File

@ -24,7 +24,7 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/anypb"
) )
@ -78,14 +78,14 @@ func (s *remoteSandboxController) Start(ctx context.Context, sandboxID string) (
}, nil }, nil
} }
func (s *remoteSandboxController) Platform(ctx context.Context, sandboxID string) (platforms.Platform, error) { func (s *remoteSandboxController) Platform(ctx context.Context, sandboxID string) (imagespec.Platform, error) {
resp, err := s.client.Platform(ctx, &api.ControllerPlatformRequest{SandboxID: sandboxID}) resp, err := s.client.Platform(ctx, &api.ControllerPlatformRequest{SandboxID: sandboxID})
if err != nil { if err != nil {
return platforms.Platform{}, errdefs.FromGRPC(err) return imagespec.Platform{}, errdefs.FromGRPC(err)
} }
platform := resp.GetPlatform() platform := resp.GetPlatform()
return platforms.Platform{ return imagespec.Platform{
Architecture: platform.GetArchitecture(), Architecture: platform.GetArchitecture(),
OS: platform.GetOS(), OS: platform.GetOS(),
Variant: platform.GetVariant(), Variant: platform.GetVariant(),

8
internal/cri/server/container_create.go
View File

@ -351,7 +351,7 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
// volumeMounts sets up image volumes for container. Rely on the removal of container // volumeMounts sets up image volumes for container. Rely on the removal of container
// root directory to do cleanup. Note that image volume will be skipped, if there is criMounts // root directory to do cleanup. Note that image volume will be skipped, if there is criMounts
// specified with the same destination. // specified with the same destination.
func (c *criService) volumeMounts(platform platforms.Platform, containerRootDir string, containerConfig *runtime.ContainerConfig, config *imagespec.ImageConfig) []*runtime.Mount { func (c *criService) volumeMounts(platform imagespec.Platform, containerRootDir string, containerConfig *runtime.ContainerConfig, config *imagespec.ImageConfig) []*runtime.Mount {
var uidMappings, gidMappings []*runtime.IDMapping var uidMappings, gidMappings []*runtime.IDMapping
if platform.OS == "linux" { if platform.OS == "linux" {
if usernsOpts := containerConfig.GetLinux().GetSecurityContext().GetNamespaceOptions().GetUsernsOptions(); usernsOpts != nil { if usernsOpts := containerConfig.GetLinux().GetSecurityContext().GetNamespaceOptions().GetUsernsOptions(); usernsOpts != nil {
@ -399,7 +399,7 @@ func (c *criService) volumeMounts(platform platforms.Platform, containerRootDir
} }
// runtimeSpec returns a default runtime spec used in cri-containerd. // runtimeSpec returns a default runtime spec used in cri-containerd.
func (c *criService) runtimeSpec(id string, platform platforms.Platform, baseSpecFile string, opts ...oci.SpecOpts) (*runtimespec.Spec, error) { func (c *criService) runtimeSpec(id string, platform imagespec.Platform, baseSpecFile string, opts ...oci.SpecOpts) (*runtimespec.Spec, error) {
// GenerateSpec needs namespace. // GenerateSpec needs namespace.
ctx := util.NamespacedContext() ctx := util.NamespacedContext()
container := &containers.Container{ID: id} container := &containers.Container{ID: id}
@ -482,7 +482,7 @@ func generateUserString(username string, uid, gid *runtime.Int64Value) (string,
// runtime information (rootfs mounted), or platform specific checks with // runtime information (rootfs mounted), or platform specific checks with
// no defined workaround (yet) to specify for other platforms. // no defined workaround (yet) to specify for other platforms.
func (c *criService) platformSpecOpts( func (c *criService) platformSpecOpts(
platform platforms.Platform, platform imagespec.Platform,
config *runtime.ContainerConfig, config *runtime.ContainerConfig,
imageConfig *imagespec.ImageConfig, imageConfig *imagespec.ImageConfig,
) ([]oci.SpecOpts, error) { ) ([]oci.SpecOpts, error) {
@ -529,7 +529,7 @@ func (c *criService) platformSpecOpts(
// buildContainerSpec build container's OCI spec depending on controller's target platform OS. // buildContainerSpec build container's OCI spec depending on controller's target platform OS.
func (c *criService) buildContainerSpec( func (c *criService) buildContainerSpec(
platform platforms.Platform, platform imagespec.Platform,
id string, id string,
sandboxID string, sandboxID string,
sandboxPid uint32, sandboxPid uint32,

10
internal/cri/server/container_create_test.go
View File

@ -241,7 +241,7 @@ func TestVolumeMounts(t *testing.T) {
for _, test := range []struct { for _, test := range []struct {
desc string desc string
platform platforms.Platform platform imagespec.Platform
criMounts []*runtime.Mount criMounts []*runtime.Mount
usernsEnabled bool usernsEnabled bool
imageVolumes map[string]struct{} imageVolumes map[string]struct{}
@ -293,7 +293,7 @@ func TestVolumeMounts(t *testing.T) {
}, },
{ {
desc: "should make relative paths absolute on Linux", desc: "should make relative paths absolute on Linux",
platform: platforms.Platform{OS: "linux"}, platform: imagespec.Platform{OS: "linux"},
imageVolumes: map[string]struct{}{ imageVolumes: map[string]struct{}{
"./test-volume-1": {}, "./test-volume-1": {},
"C:/test-volume-2": {}, "C:/test-volume-2": {},
@ -309,7 +309,7 @@ func TestVolumeMounts(t *testing.T) {
}, },
{ {
desc: "should include mappings for image volumes on Linux", desc: "should include mappings for image volumes on Linux",
platform: platforms.Platform{OS: "linux"}, platform: imagespec.Platform{OS: "linux"},
usernsEnabled: true, usernsEnabled: true,
imageVolumes: map[string]struct{}{ imageVolumes: map[string]struct{}{
"/test-volume-1/": {}, "/test-volume-1/": {},
@ -323,7 +323,7 @@ func TestVolumeMounts(t *testing.T) {
}, },
{ {
desc: "should NOT include mappings for image volumes on Linux if !userns", desc: "should NOT include mappings for image volumes on Linux if !userns",
platform: platforms.Platform{OS: "linux"}, platform: imagespec.Platform{OS: "linux"},
usernsEnabled: false, usernsEnabled: false,
imageVolumes: map[string]struct{}{ imageVolumes: map[string]struct{}{
"/test-volume-1/": {}, "/test-volume-1/": {},
@ -336,7 +336,7 @@ func TestVolumeMounts(t *testing.T) {
}, },
{ {
desc: "should convert rel imageVolume paths to abs paths and add userns mappings", desc: "should convert rel imageVolume paths to abs paths and add userns mappings",
platform: platforms.Platform{OS: "linux"}, platform: imagespec.Platform{OS: "linux"},
usernsEnabled: true, usernsEnabled: true,
imageVolumes: map[string]struct{}{ imageVolumes: map[string]struct{}{
"test-volume-1/": {}, "test-volume-1/": {},

3
internal/cri/server/images/service.go
View File

@ -32,6 +32,7 @@ import (
"github.com/containerd/platforms" "github.com/containerd/platforms"
docker "github.com/distribution/reference" docker "github.com/distribution/reference"
imagedigest "github.com/opencontainers/go-digest" imagedigest "github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
) )
@ -44,7 +45,7 @@ type imageClient interface {
type ImagePlatform struct { type ImagePlatform struct {
Snapshotter string Snapshotter string
Platform platforms.Platform Platform imagespec.Platform
} }
type CRIImageService struct { type CRIImageService struct {

3
internal/cri/server/podsandbox/controller.go
View File

@ -24,6 +24,7 @@ import (
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
eventtypes "github.com/containerd/containerd/api/events" eventtypes "github.com/containerd/containerd/api/events"
@ -134,7 +135,7 @@ type Controller struct {
var _ sandbox.Controller = (*Controller)(nil) var _ sandbox.Controller = (*Controller)(nil)
func (c *Controller) Platform(_ctx context.Context, _sandboxID string) (platforms.Platform, error) { func (c *Controller) Platform(_ctx context.Context, _sandboxID string) (imagespec.Platform, error) {
return platforms.DefaultSpec(), nil return platforms.DefaultSpec(), nil
} }

6
internal/cri/server/sandbox_service.go
View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/containerd/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
@ -94,10 +94,10 @@ func (c *criSandboxService) SandboxStatus(ctx context.Context, sandboxer string,
return ctrl.Status(ctx, sandboxID, verbose) return ctrl.Status(ctx, sandboxID, verbose)
} }
func (c *criSandboxService) SandboxPlatform(ctx context.Context, sandboxer string, sandboxID string) (platforms.Platform, error) { func (c *criSandboxService) SandboxPlatform(ctx context.Context, sandboxer string, sandboxID string) (imagespec.Platform, error) {
ctrl, err := c.SandboxController(sandboxer) ctrl, err := c.SandboxController(sandboxer)
if err != nil { if err != nil {
return platforms.Platform{}, err return imagespec.Platform{}, err
} }
return ctrl.Platform(ctx, sandboxID) return ctrl.Platform(ctx, sandboxID)
} }

4
internal/cri/server/service.go
View File

@ -28,8 +28,8 @@ import (
"github.com/containerd/go-cni" "github.com/containerd/go-cni"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/platforms"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opencontainers/runtime-spec/specs-go/features" "github.com/opencontainers/runtime-spec/specs-go/features"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/kubelet/pkg/cri/streaming" "k8s.io/kubelet/pkg/cri/streaming"
@ -79,7 +79,7 @@ type sandboxService interface {
StopSandbox(ctx context.Context, sandboxer, sandboxID string, opts ...sandbox.StopOpt) error StopSandbox(ctx context.Context, sandboxer, sandboxID string, opts ...sandbox.StopOpt) error
ShutdownSandbox(ctx context.Context, sandboxer string, sandboxID string) error ShutdownSandbox(ctx context.Context, sandboxer string, sandboxID string) error
SandboxStatus(ctx context.Context, sandboxer string, sandboxID string, verbose bool) (sandbox.ControllerStatus, error) SandboxStatus(ctx context.Context, sandboxer string, sandboxID string, verbose bool) (sandbox.ControllerStatus, error)
SandboxPlatform(ctx context.Context, sandboxer string, sandboxID string) (platforms.Platform, error) SandboxPlatform(ctx context.Context, sandboxer string, sandboxID string) (imagespec.Platform, error)
SandboxController(sandboxer string) (sandbox.Controller, error) SandboxController(sandboxer string) (sandbox.Controller, error)
} }

5
internal/cri/server/service_test.go
View File

@ -22,6 +22,7 @@ import (
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/go-cni" "github.com/containerd/go-cni"
"github.com/containerd/platforms" "github.com/containerd/platforms"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
@ -62,7 +63,7 @@ func (f *fakeSandboxService) SandboxStatus(ctx context.Context, sandboxer string
return sandbox.ControllerStatus{}, errdefs.ErrNotImplemented return sandbox.ControllerStatus{}, errdefs.ErrNotImplemented
} }
func (f *fakeSandboxService) SandboxPlatform(ctx context.Context, sandboxer string, sandboxID string) (platforms.Platform, error) { func (f *fakeSandboxService) SandboxPlatform(ctx context.Context, sandboxer string, sandboxID string) (imagespec.Platform, error) {
return platforms.DefaultSpec(), nil return platforms.DefaultSpec(), nil
} }
@ -80,7 +81,7 @@ func (f fakeSandboxController) Start(ctx context.Context, sandboxID string) (san
return sandbox.ControllerInstance{}, errdefs.ErrNotImplemented return sandbox.ControllerInstance{}, errdefs.ErrNotImplemented
} }
func (f fakeSandboxController) Platform(_ctx context.Context, _sandboxID string) (platforms.Platform, error) { func (f fakeSandboxController) Platform(_ctx context.Context, _sandboxID string) (imagespec.Platform, error) {
return platforms.DefaultSpec(), nil return platforms.DefaultSpec(), nil
} }

10
plugins/sandbox/controller.go
View File

@ -24,9 +24,9 @@ import (
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/platforms"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/anypb"
runtimeAPI "github.com/containerd/containerd/api/runtime/sandbox/v1" runtimeAPI "github.com/containerd/containerd/api/runtime/sandbox/v1"
@ -198,18 +198,18 @@ func (c *controllerLocal) Start(ctx context.Context, sandboxID string) (sandbox.
}, nil }, nil
} }
func (c *controllerLocal) Platform(ctx context.Context, sandboxID string) (platforms.Platform, error) { func (c *controllerLocal) Platform(ctx context.Context, sandboxID string) (imagespec.Platform, error) {
svc, err := c.getSandbox(ctx, sandboxID) svc, err := c.getSandbox(ctx, sandboxID)
if err != nil { if err != nil {
return platforms.Platform{}, err return imagespec.Platform{}, err
} }
response, err := svc.Platform(ctx, &runtimeAPI.PlatformRequest{SandboxID: sandboxID}) response, err := svc.Platform(ctx, &runtimeAPI.PlatformRequest{SandboxID: sandboxID})
if err != nil { if err != nil {
return platforms.Platform{}, fmt.Errorf("failed to get sandbox platform: %w", errdefs.FromGRPC(err)) return imagespec.Platform{}, fmt.Errorf("failed to get sandbox platform: %w", errdefs.FromGRPC(err))
} }
var platform platforms.Platform var platform imagespec.Platform
if p := response.GetPlatform(); p != nil { if p := response.GetPlatform(); p != nil {
platform.OS = p.OS platform.OS = p.OS
platform.Architecture = p.Architecture platform.Architecture = p.Architecture