-
Notifications
You must be signed in to change notification settings - Fork 40
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
fix: update containerd config #135
Conversation
@lyp256 fix ci check first |
Signed-off-by: lyp256 <lyp256@qq.com>
Codecov Report
@@ Coverage Diff @@
## master #135 +/- ##
==========================================
+ Coverage 11.54% 11.69% +0.15%
==========================================
Files 99 99
Lines 15511 15619 +108
==========================================
+ Hits 1790 1826 +36
- Misses 13486 13555 +69
- Partials 235 238 +3
|
/cc x893675 |
/cc @lixd @zhuzhenfan |
pkg/scheme/core/v1/cri/containerd.go
Outdated
return nil | ||
} | ||
configDir := containerdDefaultRegistryConfigDir | ||
if runnable.RegistryConfigDir != "" { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
where is RegistryConfigDir from? Does front add a field?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This field is currently reserved to enhance customizability, and can be obtained from the web page later
pkg/scheme/core/v1/cri/template.go
Outdated
[plugins."io.containerd.grpc.v1.cri".registry] | ||
config_path = "" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this need to sync with runnable.RegistryConfigDir.
Signed-off-by: lyp256 <lyp256@qq.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/lgtm cancel |
Signed-off-by: lyp256 <lyp256@qq.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
LGTM label has been added. Git tree hash: 1720f8918184f4f17701155f55cbb701f3b1a27b
|
tested,it works, can pull images from HTTPS repo. |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lixd, lyp256, x893675 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 |
/cherrypick release-1.1 |
@x893675: new pull request created: #156 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Signed-off-by: lyp256 lyp256@qq.com
What type of PR is this?
/kind bug
What this PR does / why we need it:
containerd uses an outdated configuration file
Which issue(s) this PR fixes:
Fixes #121
Special notes for reviewers:
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: