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.

Sign up for GitHub

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

Jump to bottom

Add containerd option for registry mirrors #10507

Merged
merged 2 commits into from
Dec 29, 2020
Merged

Add containerd option for registry mirrors #10507

merged 2 commits into from
Dec 29, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Dec 28, 2020

This simplifies the way containerd options can be added, using pelletier/go-toml.
Next step for 1.20 would be to move config generation to NodeUp.

/cc @olemarkus @zetaab
@bharath-123

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/api labels Dec 28, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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

@k8s-ci-robot k8s-ci-robot added area/documentation approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 28, 2020
@olemarkus
Copy link
Member

/hold for more comments if necessary
/lgtm

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 28, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 28, 2020
@bharath-12345
Copy link

looks good. I ll rework my PR to default systemd as a cgroup-driver to use this toml library. Thanks for doing this!

@rifelpet
Copy link
Member

can you use the field in an integration test so we can confirm the expected output?

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 28, 2020
@hakman
Copy link
Member Author

hakman commented Dec 28, 2020

can you use the field in an integration test so we can confirm the expected output?

Sounds good to me. Done.

@hakman
Copy link
Member Author

hakman commented Dec 29, 2020

Seems like it's ready now. Thanks everyone :).
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 29, 2020
@olemarkus
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 29, 2020
@k8s-ci-robot k8s-ci-robot merged commit dded75e into kubernetes:master Dec 29, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Dec 29, 2020
@hakman
Copy link
Member Author

hakman commented Dec 29, 2020

Thanks @olemarkus

@hakman hakman deleted the containerd-registry-mirrors branch December 29, 2020 18:35
k8s-ci-robot added a commit that referenced this pull request Jan 5, 2021
@k8s-ci-robot
Merge pull request #10510 from hakman/containerd-registry-mirrors-1.19
b026009 
Manual cherry-pick of #10507: Add containerd option for registry mirrors
@hakman hakman mentioned this pull request Jan 11, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olemarkus olemarkus Awaiting requested review from olemarkus

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@olemarkus olemarkus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/documentation cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@hakman @k8s-ci-robot @olemarkus @bharath-12345 @rifelpet