Skip to content

Commit b5274fe

Browse files
estespestesp
authored
Merge pull request #2610 from jterry75/fixup_oci_default_lcow
Add a Windows section for Linux oci on LCOW
2 parents 55952ad + ef91031 commit b5274fe

File tree

4 files changed

+66
-23
lines changed

4 files changed

+66
-23
lines changed

‎oci/spec.go

+18-9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package oci
1919
import (
2020
"context"
2121
"path/filepath"
22+
"runtime"
2223

2324
"github.com/containerd/containerd/namespaces"
2425
"github.com/containerd/containerd/platforms"
@@ -51,22 +52,30 @@ func GenerateSpec(ctx context.Context, client Client, c *containers.Container, o
5152
// GenerateSpecWithPlatform will generate a default spec from the provided image
5253
// for use as a containerd container in the platform requested.
5354
func GenerateSpecWithPlatform(ctx context.Context, client Client, platform string, c *containers.Container, opts ...SpecOpts) (*Spec, error) {
55+
var s Spec
56+
if err := generateDefaultSpecWithPlatform(ctx, platform, c.ID, &s); err != nil {
57+
return nil, err
58+
}
59+
60+
return &s, ApplyOpts(ctx, client, c, &s, opts...)
61+
}
62+
63+
func generateDefaultSpecWithPlatform(ctx context.Context, platform, id string, s *Spec) error {
5464
plat, err := platforms.Parse(platform)
5565
if err != nil {
56-
return nil, err
66+
return err
5767
}
5868

59-
var s Spec
6069
if plat.OS == "windows" {
61-
err = populateDefaultWindowsSpec(ctx, &s, c.ID)
70+
err = populateDefaultWindowsSpec(ctx, s, id)
6271
} else {
63-
err = populateDefaultUnixSpec(ctx, &s, c.ID)
64-
}
65-
if err != nil {
66-
return nil, err
72+
err = populateDefaultUnixSpec(ctx, s, id)
73+
if err == nil && runtime.GOOS == "windows" {
74+
// To run LCOW we have a Linux and Windows section. Add an empty one now.
75+
s.Windows = &specs.Windows{}
76+
}
6777
}
68-
69-
return &s, ApplyOpts(ctx, client, c, &s, opts...)
78+
return err
7079
}
7180

7281
// ApplyOpts applys the options to the given spec, injecting data from the

‎oci/spec_opts.go

+2-14
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"io/ioutil"
2424
"os"
2525
"path/filepath"
26-
"runtime"
2726
"strconv"
2827
"strings"
2928

@@ -91,10 +90,7 @@ func setCapabilities(s *Spec) {
9190
// Use as the first option to clear the spec, then apply options afterwards.
9291
func WithDefaultSpec() SpecOpts {
9392
return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
94-
if runtime.GOOS == "windows" {
95-
return populateDefaultWindowsSpec(ctx, s, c.ID)
96-
}
97-
return populateDefaultUnixSpec(ctx, s, c.ID)
93+
return generateDefaultSpecWithPlatform(ctx, platforms.DefaultString(), c.ID, s)
9894
}
9995
}
10096

@@ -104,15 +100,7 @@ func WithDefaultSpec() SpecOpts {
104100
// Use as the first option to clear the spec, then apply options afterwards.
105101
func WithDefaultSpecForPlatform(platform string) SpecOpts {
106102
return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
107-
plat, err := platforms.Parse(platform)
108-
if err != nil {
109-
return err
110-
}
111-
112-
if plat.OS == "windows" {
113-
return populateDefaultWindowsSpec(ctx, s, c.ID)
114-
}
115-
return populateDefaultUnixSpec(ctx, s, c.ID)
103+
return generateDefaultSpecWithPlatform(ctx, platform, c.ID, s)
116104
}
117105
}
118106

‎oci/spec_test.go

+38
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,44 @@ func TestGenerateSpec(t *testing.T) {
7373
}
7474
}
7575

76+
func TestGenerateSpecWithPlatform(t *testing.T) {
77+
t.Parallel()
78+
79+
ctx := namespaces.WithNamespace(context.Background(), "testing")
80+
platforms := []string{"windows/amd64", "linux/amd64"}
81+
for _, p := range platforms {
82+
t.Logf("Testing platform: %s", p)
83+
s, err := GenerateSpecWithPlatform(ctx, nil, p, &containers.Container{ID: t.Name()})
84+
if err != nil {
85+
t.Fatalf("failed to generate spec: %v", err)
86+
}
87+
88+
if s.Root == nil {
89+
t.Fatal("expected non nil Root section.")
90+
}
91+
if s.Process == nil {
92+
t.Fatal("expected non nil Process section.")
93+
}
94+
if p == "windows/amd64" {
95+
if s.Linux != nil {
96+
t.Fatal("expected nil Linux section")
97+
}
98+
if s.Windows == nil {
99+
t.Fatal("expected non nil Windows section")
100+
}
101+
} else {
102+
if s.Linux == nil {
103+
t.Fatal("expected non nil Linux section")
104+
}
105+
if runtime.GOOS == "windows" && s.Windows == nil {
106+
t.Fatal("expected non nil Windows section for LCOW")
107+
} else if runtime.GOOS != "windows" && s.Windows != nil {
108+
t.Fatal("expected nil Windows section")
109+
}
110+
}
111+
}
112+
}
113+
76114
func TestSpecWithTTY(t *testing.T) {
77115
t.Parallel()
78116

‎runtime/v2/runhcs/service.go

+8
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,14 @@ func writeMountsToConfig(bundle string, mounts []*containerd_types.Mount) error
314314
return errors.Wrap(err, "failed to seek to 0 in config.json")
315315
}
316316

317+
// If we are creating LCOW make sure that spec.Windows is filled out before
318+
// appending layer folders.
319+
if m.Type == "lcow-layer" && spec.Windows == nil {
320+
spec.Windows = &oci.Windows{
321+
HyperV: &oci.WindowsHyperV{},
322+
}
323+
}
324+
317325
// Append the parents
318326
spec.Windows.LayerFolders = append(spec.Windows.LayerFolders, parentLayerPaths...)
319327
// Append the scratch

0 commit comments

Comments
 (0)