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

fix: update containerd config #135

Merged
merged 3 commits into from
Aug 25, 2022

Conversation

lyp256
Copy link
Contributor

@lyp256 lyp256 commented Aug 17, 2022

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?

None

Additional documentation, usage docs, etc.:

@kubeclipper-bot kubeclipper-bot added kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes do-not-merge/release-note-label-needed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. release-note-none and removed do-not-merge/release-note-label-needed labels Aug 17, 2022
@x893675
Copy link
Collaborator

x893675 commented Aug 18, 2022

@lyp256 fix ci check first

Signed-off-by: lyp256 <lyp256@qq.com>
@codecov-commenter
Copy link

codecov-commenter commented Aug 18, 2022

Codecov Report

Merging #135 (f702416) into master (8cd1773) will increase coverage by 0.15%.
The diff coverage is 39.56%.

Impacted file tree graph

@@            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     
Impacted Files Coverage Δ
pkg/scheme/core/v1/cri/cri.go 20.00% <ø> (ø)
pkg/scheme/core/v1/cri/containerd.go 15.68% <39.56%> (+13.26%) ⬆️
pkg/scheme/core/v1/k8s/cluster.go 0.11% <0.00%> (-0.01%) ⬇️
pkg/cli/join/join.go 0.00% <0.00%> (ø)
pkg/component/nfs/nfs.go 0.58% <0.00%> (ø)
pkg/apis/core/v1/utils.go 55.05% <0.00%> (ø)
pkg/cli/registry/registry.go 0.00% <0.00%> (ø)
pkg/cli/resource/resource.go 0.75% <0.00%> (ø)
pkg/scheme/core/v1/k8s/kubeadm_step.go 0.00% <0.00%> (ø)

@lyp256
Copy link
Contributor Author

lyp256 commented Aug 18, 2022

/cc x893675

@x893675
Copy link
Collaborator

x893675 commented Aug 18, 2022

/cc @lixd @zhuzhenfan

return nil
}
configDir := containerdDefaultRegistryConfigDir
if runnable.RegistryConfigDir != "" {
Copy link
Contributor

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?

Copy link
Contributor Author

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

[plugins."io.containerd.grpc.v1.cri".registry]
config_path = ""
Copy link
Contributor

@lixd lixd Aug 23, 2022

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>
Copy link
Contributor

@lixd lixd left a comment

Choose a reason for hiding this comment

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

/lgtm

@kubeclipper-bot kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2022
@lixd
Copy link
Contributor

lixd commented Aug 25, 2022

/lgtm cancel

@kubeclipper-bot kubeclipper-bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 25, 2022
Signed-off-by: lyp256 <lyp256@qq.com>
Copy link
Contributor

@lixd lixd left a comment

Choose a reason for hiding this comment

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

/lgtm

@kubeclipper-bot kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 25, 2022
@kubeclipper-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 1720f8918184f4f17701155f55cbb701f3b1a27b

@lixd
Copy link
Contributor

lixd commented Aug 25, 2022

tested,it works, can pull images from HTTPS repo.

@x893675
Copy link
Collaborator

x893675 commented Aug 25, 2022

/approve

@kubeclipper-bot
Copy link
Collaborator

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubeclipper-bot kubeclipper-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 25, 2022
@kubeclipper-bot kubeclipper-bot merged commit df2090c into kubeclipper:master Aug 25, 2022
@x893675
Copy link
Collaborator

x893675 commented Aug 25, 2022

/cherrypick release-1.1

@kubeclipper-bot
Copy link
Collaborator

@x893675: new pull request created: #156

In response to this:

/cherrypick release-1.1

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

containerd config need update
5 participants