Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

koordlet: support cri-o container runtime #1983

Merged
merged 42 commits into from
Apr 28, 2024

Conversation

georgexiang
Copy link
Contributor

Ⅰ. Describe what this PR does

This PR will add koordlet support for the cri-o runtime , solve problems like "│ koordlet-vgmdg W0403 04:29:39.470690 919471 cgroup_reconcile.go:226] parse containerDir error! msg: unknown container protocol cri-o://088b531d2f86e63c6f35c823078 1be16fb0fe5788c14761812d1e8666596e0d
” running error.

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Deploying koordinatr in the cri-o v1.28 environment runs normally.

Ⅳ. Special notes for reviews

V. Checklist

  • I have written necessary docs and comments
  • I have added necessary unit tests and integration tests
  • All checks passed in make test

Copy link

codecov bot commented Apr 3, 2024

Codecov Report

Attention: Patch coverage is 35.80247% with 52 lines in your changes are missing coverage. Please review.

Project coverage is 68.71%. Comparing base (f85aefc) to head (688249e).
Report is 2 commits behind head on main.

Files Patch % Lines
pkg/koordlet/util/runtime/handler/crio_runtime.go 22.22% 33 Missing and 2 partials ⚠️
pkg/koordlet/util/runtime/runtime.go 47.82% 9 Missing and 3 partials ⚠️
pkg/koordlet/util/pod.go 40.00% 2 Missing and 1 partial ⚠️
pkg/koordlet/util/system/cgroup_driver.go 75.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1983      +/-   ##
==========================================
- Coverage   68.77%   68.71%   -0.07%     
==========================================
  Files         422      423       +1     
  Lines       39058    39137      +79     
==========================================
+ Hits        26864    26893      +29     
- Misses       9870     9914      +44     
- Partials     2324     2330       +6     
Flag Coverage Δ
unittests 68.71% <35.80%> (-0.07%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zwzhang0107 zwzhang0107 changed the title Modify the name of the REG_NS variable to koordinator-sh koordlet: support cri-o container runtime Apr 7, 2024
@saintube
Copy link
Member

@georgexiang Please make the commit signed off to pass the DCO check.
image

@georgexiang
Copy link
Contributor Author

@georgexiang Please make the commit signed off to pass the DCO check. image

@saintube Thanks for the reminder. Have followed the instruction. make the commit signed off, and passed DCO check.

@koordinator-bot koordinator-bot bot added size/L and removed size/XL labels Apr 14, 2024
@georgexiang
Copy link
Contributor Author

Hi @saintube , help me look at , at this stage , how to chang this PR commit , to pass " gofmt-ed with -s (gofmt) check " , then pass the "CI / golangci-lin" and "CI / unit-tests(Verify gofmt) " . Thanks a lot.

@saintube
Copy link
Member

Hi @saintube , help me look at , at this stage , how to chang this PR commit , to pass " gofmt-ed with -s (gofmt) check " , then pass the "CI / golangci-lin" and "CI / unit-tests(Verify gofmt) " . Thanks a lot.

Please check the indention of your code. The linter check shows you can correct the code via the command gofmt.

Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: ocichina001 <165124541+ocichina001@users.noreply.github.com>
Signed-off-by: george <xiangzhihua@gmail.com>
sjtufl and others added 4 commits April 15, 2024 12:17
… annotation (koordinator-sh#1982)

Signed-off-by: sjtufl <jerryfang555@qq.com>
Signed-off-by: george <xiangzhihua@gmail.com>
…nator-sh#1999)

Signed-off-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
Co-authored-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
Signed-off-by: george <xiangzhihua@gmail.com>
…ator-sh#1994)

Signed-off-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
Co-authored-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
Signed-off-by: george <xiangzhihua@gmail.com>
Signed-off-by: george <xiangzhihua@gmail.com>
@koordinator-bot koordinator-bot bot added size/L and removed size/XXL labels Apr 15, 2024
@georgexiang
Copy link
Contributor Author

Hi @saintube , help me look at , at this stage , how to chang this PR commit , to pass " gofmt-ed with -s (gofmt) check " , then pass the "CI / golangci-lin" and "CI / unit-tests(Verify gofmt) " . Thanks a lot.

Please check the indention of your code. The linter check shows you can correct the code via the command gofmt.

Thanks for your suggestion. Have gofmted related files, passed the gofmt check.

Makefile Outdated Show resolved Hide resolved
Copy link
Member

@saintube saintube left a comment

Choose a reason for hiding this comment

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

/lgtm

@koordinator-bot koordinator-bot bot removed the lgtm label Apr 22, 2024
@saintube
Copy link
Member

/lgtm

@koordinator-bot koordinator-bot bot added the lgtm label Apr 25, 2024
@georgexiang
Copy link
Contributor Author

@hormes
Hi hormes, do you have minutes to help review this PR, or what else need me to do to complete this work? Thank you very much.

@koordinator-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hormes

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

The pull request process is described here

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 9b4c5b1 into koordinator-sh:main Apr 28, 2024
20 checks passed
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.