libcontainer: isolate libcontainer/devices by thaJeztah · Pull Request #2679 · opencontainers/runc

thaJeztah · 2020-11-10T09:33:02Z

Move the Device-related types to libcontainer/devices, so that the package can be used in isolation. Aliases have been created in libcontainer/configs for backward compatibility.

crosbymichael · 2020-11-10T15:40:12Z

+1, I'm good with the refactoring

thaJeztah · 2020-11-10T16:19:36Z

oh! forgot to move it out of draft; wanted to be sure it didn't explode; moving to "ready for review"

thaJeztah · 2020-11-10T22:42:32Z

@kolyshkin LGTY?

kolyshkin

LGTM overall. I think we may drop "Deivce" prefix from a few IDs, e.g.

configs.DeviceType -> devices.Type
config.DevicePermissions -> devices.Perms
configs.DeviceRule -> devices.Rule

and so on (not all of them though)

thaJeztah · 2020-11-19T10:03:22Z

@kolyshkin @AkihiroSuda @crosbymichael updated; PTAL

Changed:

devices.DevicePermissions -> devices.Permissions
devices.DeviceType -> devices.Type
devices.DeviceRule -> devices.Rule

thaJeztah · 2020-11-19T11:39:14Z

Hm.. some issue with the SUSE repositories?

Step 12/23 : RUN echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list     && wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_Unstable/Release.key -O- | sudo apt-key add -     && apt-get update     && apt-get install -y --no-install-recommends skopeo     && rm -rf /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list     && apt-get clean     && rm -rf /var/cache/apt /var/lib/apt/lists/*;
 ---> Running in 7b59184181e1
Warning: apt-key output should not be parsed (stdout is not a terminal)
https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/Release.key:
2020-11-19 11:08:33 ERROR 404: Not Found.
gpg: no valid OpenPGP data found.
The command '/bin/sh -c echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list     && wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_Unstable/Release.key -O- | sudo apt-key add -     && apt-get update     && apt-get install -y --no-install-recommends skopeo     && rm -rf /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list     && apt-get clean     && rm -rf /var/cache/apt /var/lib/apt/lists/*;' returned a non-zero code: 2
Makefile:62: recipe for target 'runcimage' failed
make: *** [runcimage] Error 2
The command "make clean ci cross" exited with 2.
cache.2
store build cache

thaJeztah · 2020-11-19T11:40:25Z

let me try if close/open kicks CI here

thaJeztah · 2020-11-19T13:43:23Z

Failing again 😞

The command '/bin/sh -c echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list     && wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_Unstable/Release.key -O- | sudo apt-key add -     && apt-get update     && apt-get install -y --no-install-recommends skopeo     && rm -rf /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list     && apt-get clean     && rm -rf /var/cache/apt /var/lib/apt/lists/*;' returned a non-zero code: 2
Makefile:62: recipe for target 'runcimage' failed
make: *** [runcimage] Error 2
The command "make clean ci cross" exited with 2.
cache.2
store build cache

@cyphar any ideas? is this an issue with the opensuse package repos?

thaJeztah · 2020-11-20T12:59:02Z

Rebased, as CI should now be fixed by #2686

@AkihiroSuda @kolyshkin @crosbymichael ptal

Move the Device-related types to libcontainer/devices, so that the package can be used in isolation. Aliases have been created in libcontainer/configs for backward compatibility. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2020-12-01T10:12:04Z

Rebased again, as CI seemed to be stuck in "preparing" state

kolyshkin · 2020-12-02T01:14:34Z

travis timed out:

ok 12 checkpoint and restore
ok 13 checkpoint and restore (cgroupns)
ok 14 checkpoint --pre-dump and restore

No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.

I have seen this before (in cri-o/cri-o), apparently they gradually tighten the resources and thus we need to increase the timeout :(

kolyshkin · 2020-12-02T01:14:49Z

For now I've just restarted the job

kolyshkin

LGTM

kolyshkin · 2020-12-02T01:16:26Z

@AkihiroSuda @mrunalp PTAL

This PR upgrades - docker dependency to the latest tagged release (v20.10.12) - runc dependency to the latest tagged release (v1.0.3) Docker does not abide by [semver](moby/moby#39302), so it is marked +incompatible, and transitive dependencies are upgrade manually. Runc made two minor breaking changes since v1.0.0-rc93 * cgroup manager .Set changed to accept Resources instead of Cgroup opencontainers/runc@3f65946 * config.Device moved to devices.Device opencontainers/runc#2679

This PR upgrades - docker dependency to the latest tagged release (v20.10.12) - runc dependency to the latest tagged release (v1.0.3) Docker does not abide by [semver](moby/moby#39302), so it is marked +incompatible, and transitive dependencies are upgrade manually. Runc made three relevant breaking changes * cgroup manager .Set changed to accept Resources instead of Cgroup opencontainers/runc@3f65946 * config.Device moved to devices.Device opencontainers/runc#2679 * mountinfo.Mounted now returns an error if the specified path does not exist https://github.com/moby/sys/blob/mountinfo/v0.5.0/mountinfo/mountinfo.go#L16

thaJeztah mentioned this pull request Nov 10, 2020

further reduce uses of libcontainer and update runc v1.0.0-rc93 containerd/containerd#4717

Merged

2 tasks

thaJeztah marked this pull request as ready for review November 10, 2020 16:19

AkihiroSuda previously approved these changes Nov 10, 2020

View reviewed changes

AkihiroSuda added kind/refactor refactoring easy-to-review labels Nov 10, 2020

kolyshkin reviewed Nov 10, 2020

View reviewed changes

thaJeztah dismissed AkihiroSuda’s stale review via 68c24c8 November 19, 2020 10:00

thaJeztah force-pushed the isolate_device branch from c7f8749 to 68c24c8 Compare November 19, 2020 10:00

AkihiroSuda previously approved these changes Nov 19, 2020

View reviewed changes

thaJeztah closed this Nov 19, 2020

thaJeztah reopened this Nov 19, 2020

thaJeztah dismissed AkihiroSuda’s stale review via ef3d4aa November 20, 2020 12:58

thaJeztah force-pushed the isolate_device branch from 68c24c8 to ef3d4aa Compare November 20, 2020 12:58

AkihiroSuda previously approved these changes Nov 23, 2020

View reviewed changes

AkihiroSuda added this to the 1.0.0-rc93 milestone Nov 23, 2020

thaJeztah added 2 commits December 1, 2020 11:11

libcontainer: isolate libcontainer/devices

677baf2

Move the Device-related types to libcontainer/devices, so that the package can be used in isolation. Aliases have been created in libcontainer/configs for backward compatibility. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

libcontainer/devices: remove "Device" prefix from types

4fc2de7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah dismissed AkihiroSuda’s stale review via 4fc2de7 December 1, 2020 10:11

thaJeztah force-pushed the isolate_device branch from ef3d4aa to 4fc2de7 Compare December 1, 2020 10:11

kolyshkin approved these changes Dec 2, 2020

View reviewed changes

AkihiroSuda approved these changes Dec 2, 2020

View reviewed changes

AkihiroSuda merged commit 3517877 into opencontainers:master Dec 2, 2020

thaJeztah deleted the isolate_device branch December 2, 2020 09:32

bobbypage mentioned this pull request Mar 6, 2021

vendor: cAdvisor v0.39.0 kubernetes/kubernetes#99875

Merged

katiewasnothere mentioned this pull request Oct 4, 2021

Bump github.com/containerd/containerd from 1.5.4 to 1.5.7 microsoft/hcsshim#1186

Merged

shoenig mentioned this pull request Jan 18, 2022

deps: upgrade docker and runc hashicorp/nomad#11872

Merged

Conversation

thaJeztah commented Nov 10, 2020

Uh oh!

crosbymichael commented Nov 10, 2020

Uh oh!

thaJeztah commented Nov 10, 2020

Uh oh!

thaJeztah commented Nov 10, 2020

Uh oh!

kolyshkin left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Nov 19, 2020

Uh oh!

thaJeztah commented Nov 19, 2020

Uh oh!

thaJeztah commented Nov 19, 2020

Uh oh!

thaJeztah commented Nov 19, 2020

Uh oh!

thaJeztah commented Nov 20, 2020

Uh oh!

thaJeztah commented Dec 1, 2020

Uh oh!

kolyshkin commented Dec 2, 2020

Uh oh!

kolyshkin commented Dec 2, 2020

Uh oh!

kolyshkin left a comment

Choose a reason for hiding this comment

Uh oh!

kolyshkin commented Dec 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants