Skip to content

Revive release/1.1 branch by merging main#254

Closed
kzys wants to merge 293 commits intocontainerd:release/1.1from
kzys:revive-1.1
Closed

Revive release/1.1 branch by merging main#254
kzys wants to merge 293 commits intocontainerd:release/1.1from
kzys:revive-1.1

Conversation

@kzys
Copy link
Member

@kzys kzys commented Nov 8, 2022

This commit merges fe7323f into
release/1.1 branch to cut 1.1.0. The commit was the last commit before
migrating off from gogo/protobuf.

We have cut release/1.1 in 2019-2020, but haven't really used.

Zyqsempai and others added 30 commits November 14, 2019 18:16
Signed-off-by: bpopovschi <[email protected]>
Signed-off-by: bpopovschi <[email protected]>
…stats

Added current and max swap and memory usage stats
…tions

Added OOM notification for Memory controller
.travis.yml: add cgroup v2 Vagrant box
Signed-off-by: bpopovschi <[email protected]>
Signed-off-by: bpopovschi <[email protected]>
Signed-off-by: bpopovschi <[email protected]>
Signed-off-by: bpopovschi <[email protected]>
Signed-off-by: bpopovschi <[email protected]>
pids stat was not functional due to the whitespace issue

Signed-off-by: Akihiro Suda <[email protected]>
Added ebps support(based on runc implementation)
Signed-off-by: Akihiro Suda <[email protected]>
v2: put Devices to Resources struct as a field, not as a method
Signed-off-by: Akihiro Suda <[email protected]>
v2: toggle ancestors of c.path, not c.path itself
v2: follow package import rule and update license statement
fuweid and others added 18 commits June 29, 2022 00:18
.github: use ubuntu-22.04 to test cgroupv2
Upgrade github.com/cilium/ebpf from v0.4.0 to v0.9.1
In threaded mode, we need to add thread id to cgroup.threads. This work is to make the cgroupv2 manager support AddThread().

Fixes: containerd#242

Signed-off-by: yaoyinnan <[email protected]>
Support to handle more than 4 fields in cpuacct.stat
Support cgroup.AddThread in cgroupv2 manager
io/ioutil has been deprecated since Go 1.16.

Signed-off-by: Kazuyoshi Kato <[email protected]>
Check that cgroup is empty before deleting
Signed-off-by: Austin Vazquez <[email protected]>
Update actions runner OS image to Ubuntu 22.04.
Update actions/checkout and actions/setup-go packages from v2 to v3.

Signed-off-by: Austin Vazquez <[email protected]>
@kzys kzys mentioned this pull request Nov 8, 2022
@kzys kzys force-pushed the revive-1.1 branch 2 times, most recently from 8e24ea8 to 06f1a0a Compare November 8, 2022 01:24
Kazuyoshi Kato added 2 commits November 8, 2022 02:06
This commit merges fe7323f into
release/1.1 branch to cut 1.1.0. The commit was the last commit before
migrating off from gogo/protobuf.

We have cut release/1.1 in 2019-2020, but haven't really used.

Signed-off-by: Kazuyoshi Kato <[email protected]>
@kzys kzys marked this pull request as ready for review November 8, 2022 02:13
@kzys
Copy link
Member Author

kzys commented Nov 9, 2022

Note that reviving release/1.0 is technically possible too. But since we have released multiple 1.0.x version without using the branch, this would confuse people.

@AkihiroSuda
Copy link
Member

I assume nobody has ever used the release/1.1 branch.
Can we just remove and recreate it from a main commit 2022-10-XX (TBD)?

@kzys
Copy link
Member Author

kzys commented Nov 11, 2022

Yeah. That could be possible.

@kzys kzys deleted the branch containerd:release/1.1 November 11, 2022 19:12
@kzys kzys closed this Nov 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.