forked from microsoft/azurelinux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
moby-containerd: fix test compatibility with golang 1.21 (microsoft#8031
- Loading branch information
1 parent
8d75f68
commit fdfae9c
Showing
4 changed files
with
104 additions
and
2 deletions.
There are no files selected for viewing
47 changes: 47 additions & 0 deletions
47
SPECS/moby-containerd-cc/fix_cc_tests_for_golang1.21.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| Backported from upstream 5d9bf7d1398f645882e5c2becc7815daa1770c26 | ||
|
|
||
| Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | ||
| Signed-off-by: Henry Beberman <henry.beberman@microsoft.com> | ||
|
|
||
| diff -Naur a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go | ||
| --- a/contrib/apparmor/apparmor.go 2024-02-09 13:19:03.000000000 +0000 | ||
| +++ b/contrib/apparmor/apparmor.go 2024-02-22 00:22:43.993021818 +0000 | ||
| @@ -39,6 +39,11 @@ | ||
|
|
||
| // WithDefaultProfile will generate a default apparmor profile under the provided name | ||
| // for the container. It is only generated if a profile under that name does not exist. | ||
| +// | ||
| +// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline | ||
| +// since Go 1.21. | ||
| +// | ||
| +//go:noinline | ||
| func WithDefaultProfile(name string) oci.SpecOpts { | ||
| return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error { | ||
| if err := LoadDefaultProfile(name); err != nil { | ||
| diff -Naur a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go | ||
| --- a/contrib/seccomp/seccomp.go 2024-02-09 13:19:03.000000000 +0000 | ||
| +++ b/contrib/seccomp/seccomp.go 2024-02-22 00:49:25.471844786 +0000 | ||
| @@ -30,6 +30,11 @@ | ||
| // WithProfile receives the name of a file stored on disk comprising a json | ||
| // formatted seccomp profile, as specified by the opencontainers/runtime-spec. | ||
| // The profile is read from the file, unmarshaled, and set to the spec. | ||
| +// | ||
| +// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline | ||
| +// since Go 1.21. | ||
| +// | ||
| +//go:noinline | ||
| func WithProfile(profile string) oci.SpecOpts { | ||
| return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error { | ||
| s.Linux.Seccomp = &specs.LinuxSeccomp{} | ||
| @@ -46,6 +51,11 @@ | ||
|
|
||
| // WithDefaultProfile sets the default seccomp profile to the spec. | ||
| // Note: must follow the setting of process capabilities | ||
| +// | ||
| +// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline | ||
| +// since Go 1.21. | ||
| +// | ||
| +//go:noinline | ||
| func WithDefaultProfile() oci.SpecOpts { | ||
| return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error { | ||
| s.Linux.Seccomp = DefaultProfile(s) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| Backported from upstream 5d9bf7d1398f645882e5c2becc7815daa1770c26 | ||
|
|
||
| Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | ||
| Signed-off-by: Henry Beberman <henry.beberman@microsoft.com> | ||
|
|
||
| diff -Naur a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go | ||
| --- a/contrib/apparmor/apparmor.go 2023-12-08 23:30:22.000000000 +0000 | ||
| +++ b/contrib/apparmor/apparmor.go 2024-02-21 23:33:58.302514996 +0000 | ||
| @@ -40,6 +40,11 @@ | ||
|
|
||
| // WithDefaultProfile will generate a default apparmor profile under the provided name | ||
| // for the container. It is only generated if a profile under that name does not exist. | ||
| +// | ||
| +// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline | ||
| +// since Go 1.21. | ||
| +// | ||
| +//go:noinline | ||
| func WithDefaultProfile(name string) oci.SpecOpts { | ||
| return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error { | ||
| if err := LoadDefaultProfile(name); err != nil { | ||
| diff -Naur a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go | ||
| --- a/contrib/seccomp/seccomp.go 2023-12-08 23:30:22.000000000 +0000 | ||
| +++ b/contrib/seccomp/seccomp.go 2024-02-21 23:34:20.362648277 +0000 | ||
| @@ -30,6 +30,11 @@ | ||
| // WithProfile receives the name of a file stored on disk comprising a json | ||
| // formatted seccomp profile, as specified by the opencontainers/runtime-spec. | ||
| // The profile is read from the file, unmarshaled, and set to the spec. | ||
| +// | ||
| +// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline | ||
| +// since Go 1.21. | ||
| +// | ||
| +//go:noinline | ||
| func WithProfile(profile string) oci.SpecOpts { | ||
| return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error { | ||
| s.Linux.Seccomp = &specs.LinuxSeccomp{} | ||
| @@ -46,6 +51,11 @@ | ||
|
|
||
| // WithDefaultProfile sets the default seccomp profile to the spec. | ||
| // Note: must follow the setting of process capabilities | ||
| +// | ||
| +// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline | ||
| +// since Go 1.21. | ||
| +// | ||
| +//go:noinline | ||
| func WithDefaultProfile() oci.SpecOpts { | ||
| return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error { | ||
| s.Linux.Seccomp = DefaultProfile(s) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters