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

ContainerRuntime mirror registries v1beta2 API #1674

Merged

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Dec 8, 2021

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1551
Fixes #1547
Fixes #1470

Special notes for your reviewer:

  • machine-controller already can handle dockerd registry-mirrors
  • machine-controller needs additional flags handling for containerd

Does this PR introduce a user-facing change?:

ContainerRuntime mirror registries v1beta2 API

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Dec 8, 2021
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 8, 2021
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch 2 times, most recently from 7c8c3bd to 77a2290 Compare December 9, 2021 14:50
@kubermatic-bot kubermatic-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 9, 2021
@kron4eg kron4eg marked this pull request as ready for review December 9, 2021 16:30
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 9, 2021
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch from 77a2290 to a4eb09a Compare December 9, 2021 17:24
@kron4eg
Copy link
Member Author

kron4eg commented Dec 9, 2021

/hold

Requires machine-controller support

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 9, 2021
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch from a4eb09a to 774b2ef Compare December 10, 2021 14:14
@kron4eg kron4eg marked this pull request as draft December 10, 2021 15:26
@kubermatic-bot kubermatic-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 10, 2021
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch from 34dfc78 to a7edbfd Compare December 10, 2021 15:49
@kron4eg
Copy link
Member Author

kron4eg commented Dec 10, 2021

/hold cancel

will remove draft status once machine-controller counter-part is ready

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 10, 2021
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch from a7edbfd to eb2750d Compare December 13, 2021 09:08
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch from 39a6465 to 452ef5e Compare December 13, 2021 22:14
Signed-off-by: Artiom Diomin <kron82@gmail.com>
Make it so ContainerRuntimeConfig and RegistryConfiguration are mutually
exclusive

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>
…ler addon

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kron4eg kron4eg force-pushed the mirror-registries-v1beta2-take2 branch from 452ef5e to 40bacbd Compare December 14, 2021 13:45
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kron4eg kron4eg marked this pull request as ready for review December 15, 2021 12:45
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 15, 2021
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@mate4st
Copy link
Contributor

mate4st commented Dec 16, 2021

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2021
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c3735b0db4f05f06d19af39bc1965007bde7772a

@kubermatic-bot kubermatic-bot merged commit 999f7d6 into kubermatic:master Dec 16, 2021
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.4 milestone Dec 16, 2021
@kron4eg kron4eg deleted the mirror-registries-v1beta2-take2 branch December 16, 2021 14:16
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 Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
4 participants