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

Extend containerd registry mirror config #1467

Merged
merged 1 commit into from
Oct 29, 2022
Merged

Extend containerd registry mirror config #1467

merged 1 commit into from
Oct 29, 2022

Conversation

LittleFox94
Copy link
Contributor

@LittleFox94 LittleFox94 commented Oct 24, 2022 •
edited by ahmedwaleedmalik
Loading

What this PR does / why we need it:

containerd can be configured for multiple registry mirrors per registry, this extends machine-controller to configure mirrors for registries other than docker.io, reusing the existing command line flag.

What type of PR is this?
/kind feature

Special notes for your reviewer:

This should probably be documented, but didn't find where..

Does this PR introduce a user-facing change? Then add your Release Note here:

Allow configuring containerd registry mirrors not only for docker.io

Documentation:

NONE

@LittleFox94
Extend containerd registry mirror config
fe943d2 
containerd can be configured for multiple registry mirrors per registry,
this extends machine-controller to configure mirrors for registries
other than docker.io, reusing the existing command line flag.

Signed-off-by: Mara Sophie Grosch <[email protected]>
@kubermatic-bot kubermatic-bot added kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 24, 2022
@kubermatic-bot
Copy link
Contributor

Hi @LittleFox94. Thanks for your PR.

I'm waiting for a kubermatic member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@kubermatic-bot kubermatic-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 24, 2022
LittleFox94
LittleFox94 commented Oct 24, 2022
View reviewed changes
pkg/containerruntime/config.go
@@ -45,27 +46,38 @@ func BuildConfig(opts Opts) (Config, error) {
}
}

var registryMirrors []string
// we want to match e.g. docker.io=registry.docker-cn.com, having docker.io as the first
Copy link
Contributor Author

@LittleFox94 LittleFox94 Oct 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I initially worked with : instead of =, so docker.io:registry.docker-cn.com, which looks a bit nicer to me - but there are already flags with Key=Value so matching those is probably best?

@ahmedwaleedmalik
Copy link
Member

/ok-to-test

@kubermatic-bot kubermatic-bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 28, 2022
@ahmedwaleedmalik ahmedwaleedmalik self-requested a review October 28, 2022 11:49
ahmedwaleedmalik
ahmedwaleedmalik approved these changes Oct 28, 2022
View reviewed changes
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 09a4dc97cbab55f652ec083a5ea4bc3b031fc186

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, LittleFox94

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

@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. docs/none Denotes a PR that doesn't need documentation (changes). and removed do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. labels Oct 28, 2022
@kubermatic-bot kubermatic-bot merged commit 04a5ee3 into kubermatic:main Oct 29, 2022
mate4st pushed a commit to mate4st/machine-controller that referenced this pull request Mar 13, 2023
@LittleFox94 @mate4st
Extend containerd registry mirror config (kubermatic#1467)
a2f2ebb 
containerd can be configured for multiple registry mirrors per registry,
this extends machine-controller to configure mirrors for registries
other than docker.io, reusing the existing command line flag.

Signed-off-by: Mara Sophie Grosch <[email protected]>

Signed-off-by: Mara Sophie Grosch <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahmedwaleedmalik ahmedwaleedmalik ahmedwaleedmalik approved these changes

Assignees

@ahmedwaleedmalik ahmedwaleedmalik

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@LittleFox94 @kubermatic-bot @ahmedwaleedmalik