Skip to content

docker-proxy: ensure cgroup parent for docker is valid#281

Merged
koordinator-bot[bot] merged 2 commits intokoordinator-sh:mainfrom
cheimu:feat/docker-adapt-systemd-driver
Jun 21, 2022
Merged

docker-proxy: ensure cgroup parent for docker is valid#281
koordinator-bot[bot] merged 2 commits intokoordinator-sh:mainfrom
cheimu:feat/docker-adapt-systemd-driver

Conversation

@cheimu
Copy link
Member

@cheimu cheimu commented Jun 21, 2022

Signed-off-by: Cheimu xerhoneyfc@gmail.com

Ⅰ. Describe what this PR does

For Docker container runtime, and systemd cgroup driver, the cgroup parent only container pod directory. If pass it a relative directory from kubepods.slice, there will be an OCI error. So this PR:

  1. make sure the cgroup parent format for Docker is valid
  2. make sure the cgroup parent format for hook server is full path, which will decouple the type of container runtime for hook server.

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

@koordinator-bot koordinator-bot bot requested review from ZYecho and honpey June 21, 2022 08:14
@cheimu
Copy link
Member Author

cheimu commented Jun 21, 2022

/assign @honpey @ZYecho

@codecov
Copy link

codecov bot commented Jun 21, 2022

Codecov Report

Merging #281 (ace03ea) into main (c5ee5fa) will increase coverage by 0.05%.
The diff coverage is 90.90%.

@@            Coverage Diff             @@
##             main     #281      +/-   ##
==========================================
+ Coverage   61.06%   61.12%   +0.05%     
==========================================
  Files         103      103              
  Lines        9599     9613      +14     
==========================================
+ Hits         5862     5876      +14     
  Misses       3250     3250              
  Partials      487      487              
Flag Coverage Δ
unittests 61.12% <90.90%> (+0.05%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/runtimeproxy/server/docker/handler.go 32.17% <0.00%> (ø)
pkg/runtimeproxy/server/docker/utils.go 83.06% <100.00%> (+2.15%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5ee5fa...ace03ea. Read the comment docs.

@jasonliu747 jasonliu747 added this to the v0.5 milestone Jun 21, 2022
@cheimu cheimu force-pushed the feat/docker-adapt-systemd-driver branch from 01c5f96 to f24746f Compare June 21, 2022 09:03
Signed-off-by: Cheimu <xerhoneyfc@gmail.com>
@cheimu cheimu force-pushed the feat/docker-adapt-systemd-driver branch from f24746f to 3773eaa Compare June 21, 2022 09:09
@ZYecho
Copy link
Contributor

ZYecho commented Jun 21, 2022

/lgtm

Signed-off-by: Cheimu <xerhoneyfc@gmail.com>
@koordinator-bot koordinator-bot bot removed the lgtm label Jun 21, 2022
Copy link
Member

@jasonliu747 jasonliu747 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@hormes
Copy link
Member

hormes commented Jun 21, 2022

/approve

@koordinator-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hormes, jasonliu747

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@koordinator-bot koordinator-bot bot merged commit 493a1ec into koordinator-sh:main Jun 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants