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

[2.18] Backport various fixes #8419

Merged
merged 4 commits into from
Jan 17, 2022
Merged

[2.18] Backport various fixes #8419

merged 4 commits into from
Jan 17, 2022

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Jan 12, 2022

What type of PR is this?

/kind feature

What this PR does / why we need it:

This is a collection of backports for 2.18:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

@sathieu
Avoid yanked ruamel.yaml.clib version (kubernetes-sigs#8372)
dcb4c70 
See https://pypi.org/project/ruamel.yaml.clib/#history

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
(cherry picked from commit 7ae0094)
@sathieu
Add missing example offline nerdctl_download_url (kubernetes-sigs#8373)
466300e 
(cherry picked from commit c11e4ba)
@sathieu
Allow to choose container manager commands (kubernetes-sigs#8380)
6cda67c 
This allow to workaround kubernetes-sigs#8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.

(cherry picked from commit cfd9873)

The cherry-pick was adapted because nerdctl_extra_flags is not in
the release-2.18 branch (kubernetes-sigs#8339).
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 12, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @sathieu. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 12, 2022
@sathieu
Document image_command_tool and image_command_tool_on_localhost (kube…
2cc6e5b 
…rnetes-sigs#8409)

Signed-off-by: Mathieu Parent <mathieu.parent@insee.fr>
(cherry picked from commit 43d1283)
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 12, 2022
@sathieu
Copy link
Contributor Author

sathieu commented Jan 12, 2022

@floryut @oomichi @cristicalin Please review 🙏.

@oomichi
Copy link
Contributor

oomichi commented Jan 12, 2022

/retitle [2.18] Backport various fixes
/lgtm

@k8s-ci-robot k8s-ci-robot changed the title Backport various fixes for 2.18 [2.18] Backport various fixes Jan 12, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2022
@floryut floryut added the tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. label Jan 17, 2022
floryut
floryut approved these changes Jan 17, 2022
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

@sathieu Thank you for this 👍
/ok-to-test

@k8s-ci-robot k8s-ci-robot 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 Jan 17, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, sathieu

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit 38d85cf into kubernetes-sigs:release-2.18 Jan 17, 2022
@sathieu
Copy link
Contributor Author

sathieu commented Jan 17, 2022

@floryut Thanks for merging. Is 2.18.1 release schedule known?

@sathieu sathieu deleted the backports_2.18 branch January 17, 2022 11:23
@floryut
Copy link
Member

floryut commented Jan 24, 2022

@floryut Thanks for merging. Is 2.18.1 release schedule known?

I didn't put much though on it but why not 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@holmsten holmsten Awaiting requested review from holmsten

@oomichi oomichi Awaiting requested review from oomichi

Assignees

@oomichi oomichi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sathieu @k8s-ci-robot @oomichi @floryut